Problem with merges from the root of a repository

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Problem with merges from the root of a repository

Jeppe_Oland
Hi there,

I have a problem with svnmerge giving conflicts when merging from one
repo to another.

I have bidirectional merge links set up between the 2 repositories so
that we can merge changes from a private development branch into the
trunk - and from the trunk into the private branch if anybody makes
changes there.

The problem started happening after a change was made in the trunk.
This change was merged to the private branch without problems.
Now, when merging from the private branch to the trunk, the revision
number of the trunk->private merge shows up, and of course causes conflicts.

  From digging a bit, it looks like the problem is caused by the private
repository having all its files at the root of the repository (and not
under trunk or something similar).
This causes "analyze_revs" to not correctly find the reflected revs.

I have attached a diff that fixes it for my case - but I'm not sure if
that is the right way to fix it, or if it would cause any side effects.

Regards,
-Jeppe


_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge

source_in_root.diff (428 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Problem with merges from the root of a repository

Jeppe_Oland
On 11/18/2010 7:02 PM, [hidden email] wrote:

> I have a problem with svnmerge giving conflicts when merging from one
> repo to another.
>
> I have bidirectional merge links set up between the 2 repositories so
> that we can merge changes from a private development branch into the
> trunk - and from the trunk into the private branch if anybody makes
> changes there.
>
> The problem started happening after a change was made in the trunk.
> This change was merged to the private branch without problems.
> Now, when merging from the private branch to the trunk, the revision
> number of the trunk->private merge shows up, and of course causes
> conflicts.
>
>  From digging a bit, it looks like the problem is caused by the private
> repository having all its files at the root of the repository (and not
> under trunk or something similar).
> This causes "analyze_revs" to not correctly find the reflected revs.
>
> I have attached a diff that fixes it for my case - but I'm not sure if
> that is the right way to fix it, or if it would cause any side effects.

I guess the attachment was stripped out ... here it is inline instead.

--- svnmerge_orig.py      2010-11-18 16:48:57.000000000 -0800
+++ svnmerge.py   2010-11-18 16:49:04.000000000 -0800
@@ -360,6 +360,8 @@
      locobjs = {}

      def __init__(self, repo_relative_path, uuid=None, url=None,
external_form=None):
+        if repo_relative_path == "":
+            repo_relative_path = "/"
          self.repo_relative_path = repo_relative_path
          self.uuid = uuid
          self.url = url
_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge
Reply | Threaded
Open this post in threaded view
|

Re: Problem with merges from the root of a repository

Jeppe_Oland
Any opinions on this patch?

Regards,
-Jeppe




Jeppe Oland <[hidden email]>
11/18/2010 07:15 PM

To
[hidden email]
cc

Subject
Re: [Svnmerge] Problem with merges from the root of a repository






On 11/18/2010 7:02 PM, [hidden email] wrote:

> I have a problem with svnmerge giving conflicts when merging from one
> repo to another.
>
> I have bidirectional merge links set up between the 2 repositories so
> that we can merge changes from a private development branch into the
> trunk - and from the trunk into the private branch if anybody makes
> changes there.
>
> The problem started happening after a change was made in the trunk.
> This change was merged to the private branch without problems.
> Now, when merging from the private branch to the trunk, the revision
> number of the trunk->private merge shows up, and of course causes
> conflicts.
>
>  From digging a bit, it looks like the problem is caused by the private
> repository having all its files at the root of the repository (and not
> under trunk or something similar).
> This causes "analyze_revs" to not correctly find the reflected revs.
>
> I have attached a diff that fixes it for my case - but I'm not sure if
> that is the right way to fix it, or if it would cause any side effects.

I guess the attachment was stripped out ... here it is inline instead.

--- svnmerge_orig.py      2010-11-18 16:48:57.000000000 -0800
+++ svnmerge.py   2010-11-18 16:49:04.000000000 -0800
@@ -360,6 +360,8 @@
      locobjs = {}

      def __init__(self, repo_relative_path, uuid=None, url=None,
external_form=None):
+        if repo_relative_path == "":
+            repo_relative_path = "/"
          self.repo_relative_path = repo_relative_path
          self.uuid = uuid
          self.url = url


_______________________________________________
Svnmerge mailing list
[hidden email]
http://www.orcaware.com/mailman/listinfo/svnmerge