Hi Johan, Bob and all
We took your suggestion and it still fails in that
1- when we try to merge again at the root level
(goals:
a- to move subtree merge done previously to the working copy root level so
that the past merge can be traced at the root level using svn mergeinfo
-show-revs merged)
Hi Johan, Bob and all
We took your suggestion and it still fails in that
1- when we try to merge again at the root level
(goals:
a- to move subtree merge done previously to the working copy root level so
that the past merge can be traced at the root level using svn mergeinfo
-show-
revs
Hi Bob
Thanks for your response.
What does elided mean ?
We do see the revision numbers are moved from eligible to merged in svn
mergeinfo after a svn merge and svn commit
How do we stop top posting and adhere to the rules ? We're new.
Thank you
Sincerely
On Wed, Apr 24, 2013 at 9:32 AM, Bob
On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer bob.arc...@amsi.com wrote:
Hi Johan, Bob and all
We took your suggestion and it still fails in that
1- when we try to merge again at the root level
(goals:
a- to move subtree merge done previously to the working copy root
level so that the
On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer bob.arc...@amsi.com wrote:
On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer bob.arc...@amsi.com wrote:
Hi Johan, Bob and all
We took your suggestion and it still fails in that
1- when we try to merge again at the root level
(goals:
a- to
On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer bob.arc...@amsi.com wrote:
On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer bob.arc...@amsi.com wrote:
Hi Johan, Bob and all
We took your suggestion and it still fails in that
1- when we try to merge again at the root level
(goals:
a- to
On Wed, Apr 24, 2013 at 4:25 PM, Z W mpc8...@gmail.com wrote:
Hi Bob, we're still seeing the problem of unwanted touches of files and
directories on new unmerged rev numbers, even after we reapply all merges
for all previous already-merged at feature branch root level.
We're getting concerned
-Original Message-
From: Z W [mailto:mpc8...@gmail.com]
Sent: Wednesday, April 24, 2013 4:26 PM
To: Bob Archer
Cc: Johan Corveleyn; users@subversion.apache.org
Subject: Re: merge using same revision number - quick question
On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer bob.arc
On Wed, Apr 24, 2013 at 1:30 PM, Mark Phippard markp...@gmail.com wrote:
On Wed, Apr 24, 2013 at 4:25 PM, Z W mpc8...@gmail.com wrote:
Hi Bob, we're still seeing the problem of unwanted touches of files and
directories on new unmerged rev numbers, even after we reapply all merges
for all
On Wed, Apr 24, 2013 at 1:40 PM, Bob Archer bob.arc...@amsi.com wrote:
-Original Message-
From: Z W [mailto:mpc8...@gmail.com]
Sent: Wednesday, April 24, 2013 4:26 PM
To: Bob Archer
Cc: Johan Corveleyn; users@subversion.apache.org
Subject: Re: merge using same revision number
On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard markp...@gmail.com wrote:
On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer bob.arc...@amsi.com wrote:
Please check the poperties on one of the files. Tell me what the
mergeinfo: is prior to your merge
and after your merge. Up to this point we were
On Wed, Apr 24, 2013 at 11:06 PM, Z W mpc8...@gmail.com wrote:
On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard markp...@gmail.com wrote:
On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer bob.arc...@amsi.com wrote:
Please check the poperties on one of the files. Tell me what the
mergeinfo: is
[ Please don't top-post on this list, i.e. try to put your reply at
the bottom or inline. More below ... ]
On Sat, Apr 20, 2013 at 2:32 AM, Z W mpc8...@gmail.com wrote:
On Fri, Apr 19, 2013 at 9:36 AM, Bob Archer bob.arc...@amsi.com wrote:
Hi All
We have a revision that contains a few
On Mon, Apr 22, 2013 at 10:00 PM, Z W mpc8...@gmail.com wrote:
Hi Johan
Thanks for responding.
You're welcome :-). I'm putting the users list back in cc to keep it
in the loop. Please remember to use reply all for this reason.
We didnt know of the subtree merging concept and you are right,
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
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
16 matches
Mail list logo
