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

Re: Merge tracking

From: Carl Baldwin <cnb_at_fc.hp.com>
Date: 2005-03-26 07:45:31 CET

I read up on the various things that people pointed me to. Thank you
again for your input. It seems that people have a lot of different
ideas for tracking merges. This does, indeed, appear to be a big job.

I would propose a place to start working on this problem. That is to
modify the 'svn merge' command to record the merge that it performs in a
'property' in the local sand-box. When the conflicts resulting from the
merge have been resolved then this little piece of information will be
committed to the repository. This will play nice with dump/load and
will not require any changes to the repository back-end.

Once this information is getting recorded in the repository then various
developers can go off in many different directions exploring the
different ways to use this information to make subversion 'smarter'.
This includes a 'smart merge' that knows what has been merged already
and can simply do the right thing when given a branch to merge into a
working copy.

I am willing to put some time/effort toward this little piece. Before
diving into it I would like to discuss with those who are interested
exactly how this information will be recorded by the 'svn merge'

All of the information that we need to record is in the arguments passed
to svn merge. Basically, we need a simple format to encode the
arguments (URLs, starting/ending revs) so that other tools can be
written to use it.

What do we call the property? svn:merges?

Please let me know your thoughts and I will be glad to help.

Carl Baldwin

PS The svk 'merge ticket' records most of the information that I think
is important. I do believe that it discards one minor, but still
possibly important piece. It only records one revision and assumes that
any previous merge merged all changes up to the recorded revision. This
assumption might be OK, I just want to explore the possible

On Tue, Mar 15, 2005 at 04:31:30PM -0600, Josh Siegel wrote:
> >
> >Could someone point me some things on this topic? Maybe some specific
> >threads on the email list or a page on the subversion.tigris.org or
> >something?
> >
> >Thank you,
> >Carl
> >
> >
> >
> http://svn.collab.net/repos/svn/trunk/notes/merge-tracking.txt
> this is a good place to start
> -josh
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Mar 26 07:46:41 2005

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

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