all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Unknown <unknown@unknown.invalid>
Subject: pcl-cvs / vc workflow description desired.
Date: Fri, 07 Mar 2003 04:18:46 GMT	[thread overview]
Message-ID: <G4V9a.187178$Zr%.128511@news01.bloor.is.net.cable.rogers.com> (raw)

Hi,

I'm trying to use pcl-cvs and/or vc with GNU Emacs, and not having a very good 
time with it.  In pcl-cvs, I can do the normal stuff (update, commit, add, 
etc).  But when I see the dreaded "need to merge" message, I have no idea 
what's going on.  What do I do?  It seems that it's very easy to screw up at 
this point.  I press 'd' 'E', and get the message "Merge is not applicalbe to 
any of the selected files.  But the line says "need to merge" right there.  I 
fumble around and press some keys before I know it, it's all "up-to-date", of 
course the contents is crap and I've just erased someone else's work.

I have other confustions such as why all these .#file.version files are 
popping up in my working dir.  I want to know the work-flow that I should be 
following.  At this point I'm so confused and it's so volatile that I think I 
need keystroke by keystroke help.  Any help?

Ohh, and vc, I have no idea what's going on there.  How do I quickly commit a 
file I'm editing?

--
Le

             reply	other threads:[~2003-03-07  4:18 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-03-07  4:18 Unknown [this message]
2003-03-07 16:08 ` pcl-cvs / vc workflow description desired Kai Großjohann
2003-03-10 20:29 ` Stefan Monnier
2003-03-10 23:58   ` Unknown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='G4V9a.187178$Zr%.128511@news01.bloor.is.net.cable.rogers.com' \
    --to=unknown@unknown.invalid \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.