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

Merge problems

From: Rodrigo Araujo <rodrigomaraujo_at_gmail.com>
Date: 2007-10-23 21:10:19 CEST

Hello all, I´m getting a curious errors here in my production subversion.

    Here we have two branches in a repository, the "trunk" where the
developers do the codification, and a second called "production" where I
make merge of revisions that is tested and approved in "trunk" branch (I
make the releases in this branch). I used make this merge using TSVN client,
and I get some revisions the TSVN can´t take merge, simple TSVN make a merge
process but the files changed in revision wasn´t with modifications. Ok, I
open a cygwin and make the merge with "svn.exe" client.
   But today I get the other direction error, with "svn.exe" client the
merge wasn´t made, but with TSVN client the merge was correct made. Anyone
get a situation like this?

Best Regards,

-- 
Rodrigo M. Araujo
Email: rodrigomaraujo@gmail.com
Received on Tue Oct 23 21:10:46 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.