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

mergetracking - svn merge tries to merge direct ancestors

From: Bastian Blank <bastian_at_waldi.eu.org>
Date: Sat, 19 Apr 2008 19:49:45 +0200

Hi folks

I tried mergetracking today on the debian kernel repository[1]. I use the 1.5.x
branch with r30710.

I only used /dists/sid/linux-2.6 and /dists/trunk/linux-2.6.
/dists/sid/linux-2.6 was copied (replaced) from /dists/trunk/linux-2.6
in revision 10204:

| ------------------------------------------------------------------------
| r10204 | waldi | 2008-01-26 11:12:53 +0100 (Sa, 26 Jan 2008) | 2 lines
| Changed paths:
| R /dists/sid/linux-2.6 (from /dists/trunk/linux-2.6:10203)
|
| Branch from /dists/trunk/linux-2.6.
|
| ------------------------------------------------------------------------

I did a "svn merge --record-only ../../sid/linux-2.6" on
/dists/trunk/linux-2.6, which AFAIK should just mark anything as merged. I got
the following merge info:

| Property changes on: .
| ___________________________________________________________________
| Added: svn:mergeinfo
| Merged /trunk/kernel/linux-2.6-devel:r4010
| Merged /trunk/kernel/source/linux-kernel-2.6.12:r3417-3509
| Merged /trunk/kernel/linux-2.6:r3984-4009,4011-4089
| Merged /trunk/kernel/source/linux-2.6:r3604-3983
| Merged /branches/linux-kernel-2.6.12:r3353-3416
| Merged /dists/sid/linux-2.6:r4718-4731,10204-11104
| Merged /dists/trunk/linux-2.6-2.6.14-rc4:r4469-4503
| Merged /branches/kernel-image-2.6.11:r3025-3351
| Merged /branches/kernel-image-2.6.12:r3352
| Merged /trunk/kernel/source/linux-2.6-2.6.12:r3510-3603
| Merged /dists/trunk/kernel/linux-2.6:r4090-4094
| Merged /dists/trunk/linux-2.6:r4095-4468,4504-4717,4732-10203

This infos looks weird. Also another svn merge tries to merge that again:

| $ svn merge ../../sid/linux-2.6
| --- Merging r3025 through r3351 into '.':
| A debian/control
| A debian/flavours
| $ svn info debian/control
| Path: debian/control
| Name: control
| URL: $TESTREPO/dists/trunk/linux-2.6/debian/control
| Repository Root: $TESTREPO
| Revision: 11104
| Node Kind: file
| Schedule: add
| Copied From URL: $TESTREPO/branches/kernel-image-2.6.11/debian/control
| Copied From Rev: 3351

Maybe I did something wrong, or the code is not able to cope with the history.

Bastian

[1]: svn://svn.debian.org/svn/kernel, only svn 1.4 server.

-- 
There's another way to survive.  Mutual trust -- and help.
		-- Kirk, "Day of the Dove", stardate unknown
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-19 19:50:38 CEST

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