[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
pcl-cvs / vc workflow description desired.
From: |
Le Wang |
Subject: |
pcl-cvs / vc workflow description desired. |
Date: |
Fri, 07 Mar 2003 04:18:46 GMT |
User-agent: |
KNode/0.7.1 |
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
- pcl-cvs / vc workflow description desired.,
Le Wang <=