I've found what I think is a bug in mergeinfo handling when merging to a
target with a subfolder that has explicit mergeinfo. Said explicit
mergeinfo doesn't get updated, which I think it should since the
explicit mergeinfo overrides the inheriting of the root's mergeinfo.
Thus, when you go to reintegrate, it claims that subfolder hasn't been
merged from trunk in the first place.
In the attached repro script, if you see something that says "I expect
that...", it means that's what I think should happen, but it isn't
happening. The script is a windows batch file. It expects its working
directory to be some place it can check things out to, and it expects
its only argument to be a repo URL to an empty repo (it depends on their
being 0 revisions in the repo because at one point I hardcode a revision
My test client and server version: 1.6.6 (r40053)
I first discovered this in the wild with a 1.6.4 client and a 1.5.x
server (don't know exactly the server's version).
I hope I'm not doing something stupid and this really is a bug. I don't
want to waste anyone's time. Thank you very much,
Ryan (aka Yanroy on IRC)
This e-mail communication and any attachments are confidential and intended only for the person or
entity to which it is addressed. Any review, retransmission, dissemination or other use of, or taking
of any action in reliance upon this information by persons or entities other than the intended recipient
is prohibited. If you are not the intended recipient, any review, disclosure, dissemination,
distribution or copying of it or its contents is prohibited. If you have received this communication
in error, please notify the sender immediately and destroy all copies of this communication and any attachments.
Received on 2009-10-31 13:15:30 CET