[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

FW: Bug: Resolve conflict using "theirs" in .resx files

From: Lübbe Onken | RA Consulting <l.onken_at_rac.de>
Date: Thu, 28 Feb 2008 08:37:54 +0100

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 Forwarded from issues list

> -----Original Message-----
> From: Petr Machek [mailto:Petr.Machek_at_zld.cz]
> Sent: Wednesday, February 27, 2008 4:51 PM
> To: issues_at_tortoisesvn.tigris.org
> Subject: Bug: Resolve conflict using "theirs" in .resx files
>
> Hello
> We have problems with merging resx files and choosing Resolve
> conflict using "theirs"
>
> We have two directory trees. One is switched to trunk and the
> second one to stable candidate branch.
> I wanted to merge revision from trunk.
> 1. Update on stable candidate (SC) directory tree
> 2. Merge on SC...
> 2a. Choose wanted revision from trunk to merge and click Merge
> 2b. There was 3 conflicts in Windows (see picture as an attachment)
> 2ba. Right click on conflicted file (the same action on all 3
> files) and choose Resolve conflict using "theirs"
> 2c. Click OK
> 3. I found conflict characters (>>>>>) in resx file.
>
> I've tried it 3 times with revert and every time I've got the
> same result.
> I verified original files and there was not the conflict characters
> We get this error (I think) every time when we want to merge
> conflicted resx file
>
>
> Petr Machek
> Z.L.D. s.r.o.
> Sokolská 22, Praha 2, 120 00
> http://www.zld.cz
> http://www.eccs.cz
>
>
>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)

iD8DBQFHxmTPm8gezyP1EasRAhh4AJ9uQlXdh1v+I7IsZ0uSBvT3u+5s9wCdHfT4
FawyzQHIYIM52Y4nFGEfQcY=
=L0d3
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: dev-help_at_tortoisesvn.tigris.org

ResolveConflicts.PNG
Received on 2008-02-28 08:38:42 CET

This is an archived mail posted to the TortoiseSVN Dev mailing list.