Hi Bob
Thanks for responding. I tried it and it seems to merge ok.
We're usng SVN 1.6
We tried using svn mergeinfo to help us with finding relevant revisions to
merge from a trunk to a branch.
But when we query for merged, (even for the one above),
svn mergeinfo --shows-revs merged
https://test.com/svn/root<https://test.com/svn/root/src/usr/ext/a.java>
/path/to/root
(executed but it returns nothing)
But when we ran
svn mergeinfo --shows-revs eligible
https://test.com/svn/root<https://test.com/svn/root/src/usr/ext/a.java>
/path/to/root
(a list of revision numbers shows up including the r345).
Why is that ?
Do you have a recommendation on
1- where to get the source of all rev numbers to merge from trunk to
branch? Is svn log the only way where we have to parse the logs to get
accurate count of revision numbers since mergeinfo fails us ?
2- if we apply merging command twice with the same arguments of trunk path
directory and working copy path directory, will it hurt the branch ?
Thansk
On Fri, Apr 19, 2013 at 9:36 AM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
> > Hi All
> >
> > We have a revision that contains a few changed files on the trunk:
> > r345
> > /usr/ext/a.java
> > /usr/ext/b.java
> >
> > We like to merge this a branch working copy.
> > Can we perform multiple merge svn with the same revision number ?
> > We have a reason to do that; We know it doesnt make sense in this simple
> > example.
> >
> > ie can we have 2 merge svn executions and still produce the same result
> as a
> > simple merge execution.
> > meaning
> >
> > svn merge -c 345 https://test.com/svn/root/src/usr/ext/a.java
> > svn merge -c 345 https://test.com/svn/root/src/usr/ext/b.java
> >
> > as opposed to
> > svn merge -c 345 https://test.com/svn/root/src/usr/ext
> >
> >
> > Thanks all.
>
> The resulting commit would probably be the same... although I expect the
> merge info would be applied to the files rather than the folder. Give your
> simple example a try in a test repo.
>
> BOb
>
>
Received on 2013-04-20 02:32:59 CEST