Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 6:16 PM, Branko Čibej wrote: > On 24.04.2013 23:06, Z W wrote: > > > > > > > > On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard > > wrote: > > > > On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer > > wrote: > >

Re: merge using same revision number - quick question

On 24.04.2013 23:06, Z W wrote: > > > > On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard > wrote: > > On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer > wrote: > > Please check the poperties on one of the files. Tell me what the > me

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 11:06 PM, Z W wrote: > > > > On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard wrote: >> >> On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer wrote: >> > Please check the poperties on one of the files. Tell me what the >> > mergeinfo: is prior to your merge >> > and after your mer

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 1:42 PM, Mark Phippard wrote: > On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer 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 talking about > generalities, but

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 1:40 PM, Bob Archer 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: merg

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 1:30 PM, Mark Phippard wrote: > On Wed, Apr 24, 2013 at 4:25 PM, Z W 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 f

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 4:40 PM, Bob Archer 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 talking about generalities, > but we are getting down to specifics now. FWIW, after running

RE: merge using same revision number - quick question

> -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 2

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 4:25 PM, Z W 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 now, wonderin

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer wrote: > > On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer 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

Re: merge using same revision number - quick question

On Wed, Apr 24, 2013 at 9:50 AM, Bob Archer wrote: > > On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer 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

RE: merge using same revision number - quick question

> On Wed, Apr 24, 2013 at 9:32 AM, Bob Archer 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 past

Re: merge using same revision number - quick question

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, B

RE: merge using same revision number - quick question

> 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 > -sho

Re: merge using same revision number - quick question

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) s

Re: merge using same revision number - quick question

On Mon, Apr 22, 2013 at 10:00 PM, Z W 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, we did > perfor

Re: merge using same revision number - quick question

[ 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 wrote: > On Fri, Apr 19, 2013 at 9:36 AM, Bob Archer wrote: >> >> > Hi All >> > >> > We have a revision that contains a few changed files on the trunk:

Re: merge using same revision number - quick question

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.c

RE: merge using same revision number - quick question

> 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 sen

merge using same revision number - quick question

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 ex