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

Merge problem with project file.

From: Chris Convents <Chris_Convents_at_Jabil.com>
Date: Tue, 22 Jul 2008 11:17:58 +0100

Hi all,

 

During a merge activity we encountered some problems merging our project
file (CEPAP.vpj) from branch br_gv_02 to the Trunk.

After some investigations we think we found the reason. If you look at
the revision graph included you see the first Trunk rev. of the file
being created at revision 113 based on branch revision 111.

We were trying to merge revision 112 to the trunk, but this would not
work. I think it fails because the trunk was created from rev.111. We
don't understand how you can actually create the situation as shown in
the revision graph.

Why isn't the trunk revision at 112 i.s.o. 113? Looks like the trunk
revision got created from an older revision (111) then the HEAD revision
at that moment.

Anyone an idea how this could have happened?

 

Thanks,

 

            Chris

 

 

 

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

project file - revision graph.JPG
Received on 2008-07-22 12:18:17 CEST

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