You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Alexander Kitaev <al...@tmate.org> on 2005/11/08 18:18:44 UTC
Possible incorrect merge status on update.
Hello All,
During update, in case file is locally modified, remote changes are merged
with the local ones.
Remote modifications may include not only text modifications, but also
properties modifications, including svn:eol-style and svn:keywords.
If I understood everething correctly, first, file is "dry-run" merged and
local version of the file is detransalted using existing properties values.
Then, after update is completed, file is merged again, but at this time
'incoming' property values are used. It may happen that "dry-run" merge
input differs from the "real" merge input and "real" merge outcome may
differ from the "dry-run" one, for instance 'G' status may be displayed in
console, but file will be in conflict after update.
My question is whether my understanding is correct or I miss something and
"dry-run" merge during update also uses 'incoming' property values to
detranslate local version of the file?
Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Possible incorrect merge status on update.
Posted by Philip Martin <ph...@codematters.co.uk>.
"Alexander Kitaev" <al...@tmate.org> writes:
> Should I submit these bugs to Subversion issues tracker? May I use email
> text as bug description?
Yes please.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
RE: Possible incorrect merge status on update.
Posted by Alexander Kitaev <al...@tmate.org>.
Should I submit these bugs to Subversion issues tracker? May I use email
text as bug description?
Thanks!
Alexander Kitaev,
TMate Software,
http://tmate.org/
http://jetbrains.com/tmate/
> -----Original Message-----
> From: Philip Martin [mailto:philip@codematters.co.uk]
> Sent: Tuesday, November 08, 2005 20:36
> To: alex@tmate.org
> Cc: dev@subversion.tigris.org
> Subject: Re: Possible incorrect merge status on update.
>
> "Alexander Kitaev" <al...@tmate.org> writes:
>
> > My question is whether my understanding is correct or I
> miss something
> > and "dry-run" merge during update also uses 'incoming'
> property values
> > to detranslate local version of the file?
>
> I think you are correct and it's probably a bug.
>
> --
> Philip Martin
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Possible incorrect merge status on update.
Posted by Philip Martin <ph...@codematters.co.uk>.
"Alexander Kitaev" <al...@tmate.org> writes:
> My question is whether my understanding is correct or I miss something and
> "dry-run" merge during update also uses 'incoming' property values to
> detranslate local version of the file?
I think you are correct and it's probably a bug.
--
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org