Broken branch from svn

[John Szakmeister]

On Sat, Oct 31, 2009 at 10:33 AM, John Szakmeister <john at szakmeister.net> wrote:
> On Sat, Oct 31, 2009 at 9:46 AM, Jelmer Vernooij <jelmer at samba.org> wrote:
> [snip]
>> Not necessarily - you can set the 'push_merged_revisions' option to
>> "True" to make bzr-svn always push right hand side revisions that are
>> missing from the repository.
>
> Oh, I didn't know that!  I'm going to have to see how that looks.

I'm a bit surprised.  I would have though pushing up the revisions
would have allowed bzr-svn and bzr to see the branch history, but it
doesn't.  This is after creating a new branch of trunk to see if it
finds the merged revisions:

------------------------------------------------------------
revno: 4 [merge]
committer: John Szakmeister <john at szakmeister.net>
branch nick: trunk
timestamp: Sun 2009-11-01 06:06:52 -0500
message:
  Merge my-feature2
------------------------------------------------------------
revno: 3 [merge]
committer: John Szakmeister <john at szakmeister.net>
branch nick: trunk
timestamp: Sun 2009-11-01 06:06:48 -0500
message:
  Merge my-feature1
------------------------------------------------------------
revno: 2
svn revno: 2 (on /trunk)
committer: jszakmeister
timestamp: Sun 2009-11-01 11:06:44 +0000
message:
  Add A.txt
------------------------------------------------------------
revno: 1
svn revno: 1 (on /trunk)
committer: jszakmeister
timestamp: Sun 2009-11-01 11:06:42 +0000
message:
  Initial layout


Now, I know this works when *I* push up the revisions myself.  Maybe
there is something that needs tweaking for this to work correctly?

On the Subversion side, something different definitely transpired:

------------------------------------------------------------------------
r7 | jszakmeister | 2009-11-01 06:06:52 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   M /trunk/A.txt
   A /trunk/B.txt

Merge my-feature2
------------------------------------------------------------------------
r6 | jszakmeister | 2009-11-01 06:06:52 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   R /branches/my-feature2 (from /trunk:4)
   M /branches/my-feature2/A.txt

Add even more to A.txt
------------------------------------------------------------------------
r5 | jszakmeister | 2009-11-01 06:06:52 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   A /branches/my-feature2 (from /trunk:4)

Create new branch.
------------------------------------------------------------------------
r4 | jszakmeister | 2009-11-01 06:06:48 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   M /trunk/A.txt

Merge my-feature1
------------------------------------------------------------------------
r3 | jszakmeister | 2009-11-01 06:06:48 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   A /branches/my-feature1 (from /trunk:2)

Create new branch.
------------------------------------------------------------------------
r2 | jszakmeister | 2009-11-01 06:06:44 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   A /trunk/A.txt

Add A.txt
------------------------------------------------------------------------
r1 | jszakmeister | 2009-11-01 06:06:42 -0500 (Sun, 01 Nov 2009) | 1 line
Changed paths:
   A /branches
   A /tags
   A /trunk

Initial layout
------------------------------------------------------------------------


The one thing that is different here, is that when I manually push up
the revisions, you see the last commit in the branch versus new stuff
appearing between the branch and merge (r7 would have been adding a
new file, and r8 would have been the merge).

Any thoughts?

-John