On Sat, 2004-12-25 at 00:53 +0100, J.M. Maurer wrote:
> MG: could you check if i didn't screw anything up while fixing the merge
> errors, before i 'fix' more? Don't know if I should have tagging
> something or not ...
Since I never got any reply from the dude who branched (MG for that
matter) about which branchpoint tag, etc, I took the initiative, quickly
after recieving this e-mail to tagg HEAD branch with
JMM-DOUBLEGRAPHICS-1_lastmerge to define
the last time merge from HEAD was done.
What do next time for merging ?
$cvs rtag -rHEAD JMM-DOUBLEGRAPHICS-1_merging abi
then in the sandbox for the JMM-DOUBLEGRAPHICS-1
$cvs update -jJMM-DOUBLEGRAPHICS-1_lastmerge\
-jJMM-DOUBLEGRAPHICS-1_merging
check, fix, commit
then
$cvs rtag -f -rJMM-DOUBLEGRAPHICS-1_merging \
JMM-DOUBLEGRAPHICS-1_lastmerge abi
to move the merge marker
then
$cvs rtag -d JMM-DOUBLEGRAPHICS-1_merging
to remove the merging tag.
If you have question don't hesitate to ask for help. I'll be happy to
help, answer proper questions.
And MG, if you object, dare replying my question about that branch.
Beside evasive bull**** I never got any valuable information.
Hub
-- Crazy French - http://www.figuiere.net/hub/Received on Wed Dec 29 18:46:30 2004
This archive was generated by hypermail 2.1.8 : Wed Dec 29 2004 - 18:46:30 CET