You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Nicholas Curry <Ni...@cofunds.co.uk> on 2009/10/05 16:26:38 UTC
SVN incorrectly reporting a file was updated ('U') by a merge, when
it was actually merged ('G')
Hi,
I've had an issue recently where following a merge, a file was reported
as updated rather than merged:
D:\Subversion\test\svn>svn merge "svn://path/to/folder"
--- Merging r654299 through r655378 into '.':
U ap_insDeal.sql
This file was actually changed in both the source and destination
branches, so I would have expected SVN to report it as merged ('G',
rather than 'U' in the line above.) Has anyone else seen this? I
couldn't find anything similar in the issue tracker. Is it worth trying
to create a script to recreate the issue?
Thanks,
Nick
Cofunds Limited, 1st Floor, 1 Minster Court, Mincing Lane,
London EC3R 7AA. Registered in England and Wales
No 3965289. Authorised and regulated by Financial Services Authority. Phone: 0845 604 4001, or visit our website at www.cofunds.co.uk.
Telephone calls may be recorded for monitoring purposes.
**************************************************************************
The information contained in this message may be CONFIDENTIAL and is intended for the addressee only. Any unauthorised use, dissemination of the information, or copying of this message is prohibited. If you are not the addressee, or believe this email to have been sent in error, please notify security@cofunds.co.uk immediately and delete this message.
Although this e-mail and any attachments are believed to be free of any virus, or other defect which might affect any computer or system into which they are received and opened, it is the responsibility of the recipient to ensure that they are virus free and no responsibility is accepted by Cofunds for any loss or damage from receipt or use thereof.
This email does not create or vary any contractual obligations between Cofunds Limited and the addressee. Any views or opinions are solely those of the author and do not necessarily represent those of Cofunds Limited.
Those communicating with us by electronic mail will be deemed to have accepted the risks associated with interception, amendment, loss and late or incomplete delivery. They will also be deemed to have consented to our monitoring of such communications.
**************************************************************************
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403800
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: SVN incorrectly reporting a file was updated ('U') by a merge,
when it was actually merged ('G')
Posted by Nicholas Curry <Ni...@cofunds.co.uk>.
-----Original Message-----
> From: Mark Phippard [mailto:markphip@gmail.com]
> Sent: 05 October 2009 18:13
> To: Nicholas Curry
> Cc: users@subversion.tigris.org
> Subject: Re: SVN incorrectly reporting a file was updated ('U') by a
merge, when it was actually merged ('G')
>
> On Mon, Oct 5, 2009 at 12:50 PM, Nicholas Curry
<Ni...@cofunds.co.uk>
> > So is it correct to say that during a merge, SVN reports changes
where
> > the file has
> > only changed in the source branch in the same way as when the file
has
> > changed in
> > both the source and destination branches? (i.e. with 'U'?)
>
> Yes, definitely.
>
> Prior to the tree conflict feature added in 1.6, I do not believe
> there was ever a case where SVN even looked to see if a file had been
> changed in the destination branch. Now, I believe there are cases
> where it does check that in order to flag a tree conflict. Such as
> when a folder is deleted by merge, but new files have been added to
> the folder on the branch.
OK - that's great, thanks very much for clearing that up.
Cheers,
Nick
Cofunds Limited, 1st Floor, 1 Minster Court, Mincing Lane,
London EC3R 7AA. Registered in England and Wales
No 3965289. Authorised and regulated by Financial Services Authority. Phone: 0845 604 4001, or visit our website at www.cofunds.co.uk.
Telephone calls may be recorded for monitoring purposes.
**************************************************************************
The information contained in this message may be CONFIDENTIAL and is intended for the addressee only. Any unauthorised use, dissemination of the information, or copying of this message is prohibited. If you are not the addressee, or believe this email to have been sent in error, please notify security@cofunds.co.uk immediately and delete this message.
Although this e-mail and any attachments are believed to be free of any virus, or other defect which might affect any computer or system into which they are received and opened, it is the responsibility of the recipient to ensure that they are virus free and no responsibility is accepted by Cofunds for any loss or damage from receipt or use thereof.
This email does not create or vary any contractual obligations between Cofunds Limited and the addressee. Any views or opinions are solely those of the author and do not necessarily represent those of Cofunds Limited.
Those communicating with us by electronic mail will be deemed to have accepted the risks associated with interception, amendment, loss and late or incomplete delivery. They will also be deemed to have consented to our monitoring of such communications.
**************************************************************************
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403821
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: SVN incorrectly reporting a file was updated ('U') by a merge,
when it was actually merged ('G')
Posted by Mark Phippard <ma...@gmail.com>.
On Mon, Oct 5, 2009 at 12:50 PM, Nicholas Curry <Ni...@cofunds.co.uk>
> So is it correct to say that during a merge, SVN reports changes where
> the file has
> only changed in the source branch in the same way as when the file has
> changed in
> both the source and destination branches? (i.e. with 'U'?)
Yes, definitely.
Prior to the tree conflict feature added in 1.6, I do not believe
there was ever a case where SVN even looked to see if a file had been
changed in the destination branch. Now, I believe there are cases
where it does check that in order to flag a tree conflict. Such as
when a folder is deleted by merge, but new files have been added to
the folder on the branch.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403817
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: SVN incorrectly reporting a file was updated ('U') by a merge,
when it was actually merged ('G')
Posted by Nicholas Curry <Ni...@cofunds.co.uk>.
> -----Original Message-----
> From: Mark Phippard [mailto:markphip@gmail.com]
> Sent: 05 October 2009 17:35
> To: Nicholas Curry
> Cc: users@subversion.tigris.org
> Subject: Re: SVN incorrectly reporting a file was updated ('U') by a
merge, when it was actually merged ('G')
>
> On Mon, Oct 5, 2009 at 12:26 PM, Nicholas Curry
> <Ni...@cofunds.co.uk> wrote:
>
> > I've had an issue recently where following a merge, a file was
reported as
> > updated rather than merged:
> >
> > D:\Subversion\test\svn>svn merge "svn://path/to/folder"
> >
> > --- Merging r654299 through r655378 into '.':
> >
> > U ap_insDeal.sql
> >
> >
> >
> > This file was actually changed in both the source and destination
branches,
> > so I would have expected SVN to report it as merged ('G', rather
than 'U' in
> > the line above.) Has anyone else seen this? I couldn't find anything
similar
> > in the issue tracker. Is it worth trying to create a script to
recreate the
> > issue?
>
> The only time you see a 'G' is if there are local changes to merge.
> Prior to 1.5 you would only have got a 'G' if you merged into a
> working copy that has uncommited changes. With merge tracking in
> 1.5+, the merge process can touch the same file multiple times, in
> which case you will get a 'U' the first time and then a 'G' on the
> subsequent updates to the file.
>
I see - that would explain it.
So is it correct to say that during a merge, SVN reports changes where
the file has
only changed in the source branch in the same way as when the file has
changed in
both the source and destination branches? (i.e. with 'U'?)
Thanks,
Nick
Cofunds Limited, 1st Floor, 1 Minster Court, Mincing Lane,
London EC3R 7AA. Registered in England and Wales
No 3965289. Authorised and regulated by Financial Services Authority. Phone: 0845 604 4001, or visit our website at www.cofunds.co.uk.
Telephone calls may be recorded for monitoring purposes.
**************************************************************************
The information contained in this message may be CONFIDENTIAL and is intended for the addressee only. Any unauthorised use, dissemination of the information, or copying of this message is prohibited. If you are not the addressee, or believe this email to have been sent in error, please notify security@cofunds.co.uk immediately and delete this message.
Although this e-mail and any attachments are believed to be free of any virus, or other defect which might affect any computer or system into which they are received and opened, it is the responsibility of the recipient to ensure that they are virus free and no responsibility is accepted by Cofunds for any loss or damage from receipt or use thereof.
This email does not create or vary any contractual obligations between Cofunds Limited and the addressee. Any views or opinions are solely those of the author and do not necessarily represent those of Cofunds Limited.
Those communicating with us by electronic mail will be deemed to have accepted the risks associated with interception, amendment, loss and late or incomplete delivery. They will also be deemed to have consented to our monitoring of such communications.
**************************************************************************
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403815
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: SVN incorrectly reporting a file was updated ('U') by a merge,
when it was actually merged ('G')
Posted by Mark Phippard <ma...@gmail.com>.
On Mon, Oct 5, 2009 at 12:26 PM, Nicholas Curry
<Ni...@cofunds.co.uk> wrote:
> I’ve had an issue recently where following a merge, a file was reported as
> updated rather than merged:
>
> D:\Subversion\test\svn>svn merge "svn://path/to/folder"
>
> --- Merging r654299 through r655378 into '.':
>
> U ap_insDeal.sql
>
>
>
> This file was actually changed in both the source and destination branches,
> so I would have expected SVN to report it as merged (‘G’, rather than ‘U’ in
> the line above.) Has anyone else seen this? I couldn’t find anything similar
> in the issue tracker. Is it worth trying to create a script to recreate the
> issue?
The only time you see a 'G' is if there are local changes to merge.
Prior to 1.5 you would only have got a 'G' if you merged into a
working copy that has uncommited changes. With merge tracking in
1.5+, the merge process can touch the same file multiple times, in
which case you will get a 'U' the first time and then a 'G' on the
subsequent updates to the file.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2403804
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].