monotone-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] Monotone to and from Subversion


From: Markus Schiltknecht
Subject: Re: [Monotone-devel] Monotone to and from Subversion
Date: Tue, 22 Jan 2008 11:48:16 +0100
User-agent: Mozilla-Thunderbird 2.0.0.9 (X11/20080109)

Hi,

William Uther wrote:
I was thinking at one point of using the same idea used in the cvssync.attrs branch. It would be much easier with subversion.

I didn't look at cvssync.attrs, however, cvs_import also attaches a cert to a mtn revision. It seems the right and natural way to mark monotone revisions as being imported from another VCS.

Subversion can only hold a linear history.

Yeah, that's one of the problems. Another one is that svn allows its users to update tags. A similar, but even worse problem is that svn also allows its users to branch from files at different revisions. The last one might be, that svn users tend to copy files often, which monotone can't represent properly, yet.

The only other tricky bit is the log messages to use in a push. You could just use the corresponding monotone log messages, but this loses log messages when merge revisions are pushed. In this situation, cvssync makes a composite commit message. Every revision that has multiple parents will get a composite commit message. The message is the concatenation of the log messages of every ancestor of the merge revision that is not also the ancestor of an already synced revision. This makes sure that log messages go with the revision that commits the diffs, even if they are lumped together because of the non-linear history.

Ah, you mean the log messages in the other VCS. Yeah, right.

Regards

Markus





reply via email to

[Prev in Thread] Current Thread [Next in Thread]