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

Re: Merge commit log messages

From: Gavin Lambert <tsvn_at_mirality.co.nz>
Date: 2006-08-03 05:50:12 CEST

Quoth Sebastian Good:
> This was rather my suspicion. But much as Tortoise can sneak issue
> management in under the covers, perhaps it can sneak in merge tracking.
> It knows exactly what the merge was you did... it could store that in a
> property and allow you to commit it.
>
> The accurate but useless human comment "Merged in changes from
> production hot patch to trunk (12332-12348)" would become
>
> tsvn:merge = /myapp/branches/6.1.2@12332-12348
>
> ... except that it'd have to accompany a particular transaction. which
> is where my knowledge of subversion & tortoise gets a bit fuzzy.

A complicating factor is that a merge applies to a working copy -- the
commit is a separate operation from the merge, and will usually happen
some time later (after you've tested it and made sure it still behaves
correctly).

It's also possible (although not recommended practice) to perform
multiple merges from multiple sources prior to committing all of them in
one go. This could make life complicated for an automated solution.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Aug 3 05:50:41 2006

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