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

Re: Problem mergin moves from different repos

From: Guille -bisho- <bisho_at_eurielec.etsit.upm.es>
Date: 2004-10-19 04:04:52 CEST

> To make the example more crisp, suppose that in the source repo
> 'foo' went from a MSWord document to a Latex document in revision
> 20. Then if you base 'bar' in the target repo off revision 200, then
> the history of 'bar' in the target repo will show that it started
> life as a Word document, was a Latex document for a while, then
> went back to being a Word document, which is not really true.
> I'm saying: "So what, let's just get svn merge working from multiple
> repositories even with this flaw".

But the same could happen intra-repository, or even with diff you could
convert a file into latex without changing the name.

The main problem here is that a move is considered as:
delete [file]
copy [file from version X] to [newfile]

In another branch, the merged move is considered as:
delete [file LOCAL BRANCH]
copy [file from version X of ORIGINAL BRANCH] to [newfile]

In my opinion, a move should be an exportable operation. If you want to
merge a move, and only a move into another branch, a "svn move" should
be done, locally into the branch. Right now you get a new file with not
only changes in the specified changeset X, but all the previous
changesets in the original repository.

Is the same way of working of properties: When you add a property to a
file, and try to apply that changeset to another branch, you only expect
that property to be added, not that the file to be updated to that
revision of the original repo. And that property could be something like
"this is a word document" and maybe is not true, but is a possibility
that the user should take care, not the system.

Of course later you will have problems to merge the previous changesets,
but is a mater of the user, if he only wants to merge that changeset
with a move and not all the previous changesets at the same time.

Just my 2 cents to make clear my idea... Maybe is not the desirable way
of working for others.

bisho!  _        -=] 19/10/2004 [=-
    _ ^(   )       _
   (  (   )  )     \ \___,,,     [ SAY NO TO WAR ]
  (        )        / _____ >-
    ( :: )       >==-
  '. |::| ,  >==-
    \\:://   ::            SW PATENTS will kill your job            :: 
    ........::                 EuropeSwPatentFree:                   ::
   ::            http://europeswpatentfree.hispalinux.es/             ::
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 19 04:06:01 2004

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.