Push raises exception about invalid property changes

Here's the output of 'bzr missing':

mwh@mithril-inside:discussion$ bzr missing http://codespeak.net/svn/pypy/dist
You have 2 extra revision(s):
------------------------------------------------------------
revno: 3095
committer: Michael Hudson <email address hidden>
branch nick: dist
timestamp: Wed 2007-07-11 01:40:19 +0100
message:
  merge from SVN
------------------------------------------------------------
revno: 3094
committer: Michael Hudson <email address hidden>
branch nick: dist
timestamp: Wed 2007-07-11 01:38:48 +0100
message:
  Trial commit from bzr-svn.

I'm uploading the branch to launchpad, but I'm not sure it will complete before I have to get on my flight.

On Fri, 2007-07-13 at 11:41 +0000, Michael Hudson wrote:
> ** Attachment added: "a bundle containing the changes that refuse to push"
> http://launchpadlibrarian.net/8473576/bug125751.bundle
Any chance you can also post the patch to bzr-svn used to check out this
branch?

Cheers,

Jelmer

Sure.

Uhm, bundle is empty :-)

It helps if I commit, doesn't it?

Oh, and I managed to push the so-created branch: sftp://<email address hidden>/~mwhudson/pypy/import

I updated everything (bzr, bzr-svn), blew away all the old caches, etc, reconverted and now have a branch I can push from -- over svn+ssh. http:// still doesn't work:

mwh@mithril-inside:discussion$ ~/src/bzr/bzr.dev/bzr push http://codespeak.net/svn/pypy/dist
version of bzr-svn is experimental; output may change between revisions
bzr: ERROR: libsvn._core.SubversionException: ('At least one property change failed; repository is unchanged', 175008)

Traceback (most recent call last):
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/commands.py", line 729, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/commands.py", line 691, in run_bzr
    ret = run(*run_argv)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/commands.py", line 389, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/builtins.py", line 804, in run
    push_result = br_from.push(br_to, overwrite)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/branch.py", line 1551, in push
    _override_hook_source_branch=_override_hook_source_branch)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/branch.py", line 1593, in _push_with_bound_branches
    result = self._basic_push(target, overwrite, stop_revision)
  File "/home/mwh/src/bzr/bzr.dev/bzrlib/branch.py", line 1612, in _basic_push
    target.update_revisions(self, stop_revision)
  File "/home/mwh/.bazaar/plugins/svn/branch.py", line 312, in update_revisions
    push(self, other, rev_id)
  File "/home/mwh/.bazaar/plugins/svn/commit.py", line 612, in push
    return builder.commit(rev.message)
  File "/home/mwh/.bazaar/plugins/svn/commit.py", line 380, in commit
    self.editor.close_directory(baton, self.pool)
  File "/home/mwh/.bazaar/plugins/svn/transport.py", line 88, in close_directory
    svn.delta.editor_invoke_close_directory(self.editor, *args, **kwargs)
  File "/var/lib/python-support/python2.5/libsvn/delta.py", line 506, in svn_delta_editor_invoke_close_directory
    return apply(_delta.svn_delta_editor_invoke_close_directory, args)
SubversionException: ('At least one property change failed; repository is unchanged', 175008)

bzr 0.19.0dev0 on python 2.5.1.final.0 (linux2)
arguments: ['/home/mwh/src/bzr/bzr.dev/bzr', 'push', 'http://codespeak.net/svn/pypy/dist']

** please send this report to <email address hidden>

Hi Michael,

Can you still reproduce this?

Cheers,

Jelmer
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Not sure if this is the same bug or not. I don't get the tracebacks, but i do get the merge & push failure. Attaching a script that recreates it.

  summary "Push raises exception about invalid property changes"
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Hi John,

Am Donnerstag, den 13.09.2007, 14:17 +0000 schrieb John Carr:
> Not sure if this is the same bug or not. I don't get the tracebacks, but
> i do get the merge & push failure. Attaching a script that recreates it.
>
> ** Attachment added: "Create an svn repo, check it out, branch it.. do stuff, fail."
> http://launchpadlibrarian.net/9270266/test.sh
Merges have to be committed:

--- test.sh 2007-09-15 15:48:36.000000000 +0200
+++ test-commit.sh 2007-09-15 15:49:55.000000000 +0200
@@ -37,6 +37,7 @@
 # Try and update main repo...
 bzr push file://`(cd ../ && pwd)`/bzr-wc
 bzr merge
+bzr ci -m "Merge"
 bzr push

 # Eh, what happened??

Hope this helps.

Cheers,

Jelmer
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Hi

Thanks for your quick reply. I figured as much out on the train, but sadly that change leads to:

bzr: ERROR: exceptions.AssertionError:

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 817, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 779, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 477, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 808, in run
    push_result = br_from.push(tree_to.branch, overwrite)
  File "/usr/lib/python2.4/site-packages/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1556, in push
    _override_hook_source_branch=_override_hook_source_branch)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1585, in _push_with_bound_branches
    self._basic_push(master_branch, overwrite, stop_revision)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 1617, in _basic_push
    target.update_revisions(self, stop_revision)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/branch.py", line 356, in update_revisions
    push(self, other, revid)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/commit.py", line 675, in push
    builder.commit(rev.message)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/commit.py", line 472, in commit
    assert self._new_revision_id is None or self._new_revision_id == revid
AssertionError

bzr 0.90.0 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'push']

** please send this report to <email address hidden>

bzr missing gives:

You have 2 extra revision(s):
------------------------------------------------------------
revno: 3
committer: John Carr <john@ichigo>
branch nick: bzr-branch
timestamp: Sat 2007-09-15 17:24:24 +0100
message:
  Merge with mothership
------------------------------------------------------------
revno: 2
committer: John Carr <john@ichigo>
branch nick: bzr-branch
timestamp: Sat 2007-09-15 17:24:23 +0100
message:
  Add some stuff

Fixed in the 0.4 branch, will be in 0.4.4.

  status fixcommitted

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Ehm, I still seem to suffer from this using bzr 1.3.0.dev.0 and bzr-svn 0.4.9dev0.
Any idea what's up?

bzr: ERROR: libsvn._core.SubversionException: ('At least one property change failed; repository is unchanged', 175008)

Traceback (most recent call last):
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 834, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 790, in run_bzr
    ret = run(*run_argv)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 492, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/builtins.py", line 825, in run
    push_result = br_from.push(br_to, overwrite)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/branch.py", line 1569, in push
    _override_hook_source_branch=_override_hook_source_branch)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/branch.py", line 1611, in _push_with_bound_branches
    result = self._basic_push(target, overwrite, stop_revision)
  File "/home/wouter/src/bzr/bzr.dev/bzrlib/branch.py", line 1630, in _basic_push
    target.update_revisions(self, stop_revision)
  File "/home/wouter/.bazaar/plugins/svn/branch.py", line 372, in update_revisions
    push(self, other, revid)
  File "/home/wouter/.bazaar/plugins/svn/commit.py", line 694, in push
    builder.commit(rev.message)
  File "/home/wouter/.bazaar/plugins/svn/commit.py", line 488, in commit
    self.editor.close_directory(baton, self.pool)
  File "/home/wouter/.bazaar/plugins/svn/errors.py", line 119, in convert
    raise convert_error(e)
SubversionException: ('At least one property change failed; repository is unchanged', 175008)