Hello all,
I am somewhat new to SVNkit, so I'm sure I'm simply doing something wrong or
what I need to educate myself on, but I can't seem to find out exactly WHAT…
I have the following scenario: I need to programmatically check out a branch
from a repository, then determine the eligible revision numbers to merge in
from an up-stream branch, then merge in each of those eligible revisions (one
at a time in a loop so I can programmatically preserve the author) into the
newly checked out working copy, finally committing the merged in revisions.
I've been able to successfully checkout a fresh working copy, and determine the
list of eligible revisions, but it seems to not do anything on the actual merge
itself (command-line "svn status" shows no changes in the working copy after
each iteration through the loop) but a manual diff between the two branches
shows a large number of changes.
Here's the form of doMerge I'm using:
for (SVNRevision rangeToMerge : eligibleRevisions) {
diffClient.doMerge(url, SVNRevision.HEAD,
Collections.singleton(rangeToMerge), target, SVNDepth.UNKNOWN, true, false,
false, false);
}
…with "rangeToMerge" containing the eligible revision numbers from a
List<SVNRevision>, "url" being the SOURCE branch SVNURL, and "target" being the
freshly checked-out working copy folder. The only argument I'm not sure about
is the SVNRevision.HEAD as the pegRevision value, should this be set to the
revision I want to merge from, or should that be NULL?
I've also tried setting the "force" value to true, but I get similar results.
Would anyone please be so kind as to suggest anything or anywhere I should
start looking?
Thanks in advance!
Cheers!
Randy
----------------------------------------------------------------------
This message and any attachments are intended only for the use of the addressee
and may contain information that is privileged and confidential. If the reader
of the message is not the intended recipient or an authorized representative of
the intended recipient, you are hereby notified that any dissemination of this
communication is strictly prohibited. If you have received this communication
in error, notify the sender immediately by return email and delete the message
and any attachments from your system.
