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

RE: Commit parts of a merge and leave the rest marked as unmerged for someone else

From: Kristoffer Lundén <kristoffer.lunden_at_netent.com>
Date: Mon, 14 Sep 2009 09:03:10 +0200

Hello Stefan.

 

--------------------------------------------------------

Kristoffer Lundén
Configuration Manager

Net Entertainment NE AB, Birger Jarlsgatan 57 B, S-113 56 Stockholm, Sweden
M: , T: , F: +46 8 556 967 07
kristoffer.lunden_at_netent.com, www.netent.com

Better Games

 
-----Original Message-----

From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
Sent: den 13 september 2009 09:05
To: users_at_tortoisesvn.tigris.org
Subject: Re: Commit parts of a merge and leave the rest marked as unmerged for someone else

>> I can think of a few hackish methods to do this, involving manipulation
>> of mergeinfo and other bad mojo, but I'd really rather not.

> Wouldn't the option "ignore ancestry" when merging ignore the mergeinfo
> and just do the merge?
> http://svnbook.red-> bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.nomergedata

I guess so, but that is not what I want as far as I can tell?

I want subversion to help me keep track of merges and revisions and generally do its job - but I want to be able to leave the conflicted part of the merge uncommitted so to speak, and when someone else remakes the same merge, that person should be able to repeat the result and get the same conflicts.

BR / Kristoffer

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2394451

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-14 09:04:55 CEST

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