RE: Ignoring ancestry in --reintegrate merge
From: Jacob Weber <jacob_at_jacobweber.com>
Date: Thu, 9 Jul 2009 21:27:29 -0700 (PDT)
> And this is about reintegrate:
That helps. According to that document, --reintegrate is essentially the same as "svn merge trunk branch", if I have the latest revision of the trunk merged into the branch.
And that syntax allows --ignore-ancestry. So it seems I'm able to do what I want. When I do "svn merge --ignore-ancestry trunk branch", it shows only the actual differences, without any of the R indicators for replaced files.
Which makes me wonder: why doesn't --reintegrate allow --ignore-ancestry? Wouldn't the use-case be the same?
Anyway -- thanks! This seems like a perfectly fine work-around for my problem (unless anyone can see any reason why it wouldn't work).
I imagine this syntax might do something different with the mergeinfo property. But if I delete my branch after the merge, and re-copy it from trunk (just like I would after a --reintegrate), it should be fine, right?
JW
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.