Hi,
I think there's a bug in commit_prep.pl (in the contrib/ directory), that
prevents committing the merge result of merging an existing branch with a
new one from the same version. Please let me know what you think:
At some point, I created a branch ("b1") from the latest trunk version
(let's call this latest version "x"). I made some check-ins to "b1", and
changed a file named "a.c".
At a later time, I created a new branch ("b2") from the latest trunk version
(which is newer than "x"), but "a.c" was not modified between "x" and now. I
made some check-ins to "b2", but not to "a.c". Then, I merged "b1" into
"b2", and wanted to commit. commit_prep.pl prevented me from doing so:
a.c - How dare you!! You replaced your copy of the file
'a.c',
which was based upon version 1.45, with an newer version
based
upon 1.45.2.1. Please move your 'a.c' out of the way,
perform an
update to get the current version, and them merge your
changes
into that file.
Isn't that a bug?
Thanks,
Shlomo
_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs
