‘bzr-svn’ reports inconsistency, then can't commit changes
Ben Finney
ben+bazaar at benfinney.id.au
Thu Jul 7 02:05:39 UTC 2011
Howdy all,
=====
$ bzr init-repository svn/
Shared repository with trees (format: 2a)
Location:
shared repository: svn
$ cd svn/ && bzr branch --bind svn+ssh://subversion/home/svn/empowered/trunk/ empowered/
inconsistent details in skipped record: ('719 at 58802371-0b19-4c69-acb7-7d0c5b422186:trunk%2Fwdyt%2Fsource%2Fwdyt%2Fprofile_modules%2Fmanagement%2Fcommands%2F__init__.py', 'svn-v4:58802371-0b19-4c69-acb7-7d0c5b422186:trunk:719') ('2194473 253065 0 0', ((),)) ('547943 23 0 0', ((('719 at 58802371-0b19-4c69-acb7-7d0c5b422186:trunk%2Fwdyt%2Fsource%2Fwdyt%2Fprofile_modules%2Fmanagement%2Fcommands%2F__init__.py', 'svn-v4:58802371-0b19-4c69-acb7-7d0c5b422186:trunk:719'),),))
inconsistent details in skipped record: ('719 at 58802371-0b19-4c69-acb7-7d0c5b422186:trunk%2Fwdyt%2Fsource%2Fwdyt%2Fprofile_modules%2Fmanagement%2Fcommands', 'svn-v4:58802371-0b19-4c69-acb7-7d0c5b422186:trunk:719') ('2194473 253065 0 0', ((),)) ('550491 23 0 0', ((('719 at 58802371-0b19-4c69-acb7-7d0c5b422186:trunk%2Fwdyt%2Fsource%2Fwdyt%2Fprofile_modules%2Fmanagement%2Fcommands', 'svn-v4:58802371-0b19-4c69-acb7-7d0c5b422186:trunk:719'),),))
inconsistent details in skipped record: ('719 at 58802371-0b19-4c69-acb7-7d0c5b422186:trunk%2Fwdyt%2Fsource%2Fwdyt%2Fprofile_modules%2Fmanagement%2F__init__.py', 'svn-v4:58802371-0b19-4c69-acb7-7d0c5b422186:trunk:719') ('2194473 253065 0 0', ((),)) ('550514 23 0 0', ((('719 at 58802371-0b19-4c69-acb7-7d0c5b422186:trunk%2Fwdyt%2Fsource%2Fwdyt%2Fprofile_modules%2Fmanagement%2F__init__.py', 'svn-v4:58802371-0b19-4c69-acb7-7d0c5b422186:trunk:719'),),))
Branched 3490 revision(s).
New branch bound to svn+ssh://subversion/home/svn/empowered/trunk/
=====
Great! According to <URL:https://bugs.launchpad.net/bzr/+bug/418257>
that's “not an error, it's a warning”.
So let's proceed by force-applying the changes I want (to eliminate the
factor of the other Bazaar branch data being corrupt):
=====
$ cd empowered/
$ (cd ../../devel/empowered.rt12430.confirm-reminder-email/ && bzr diff --revision ancestor:) | patch -p0
patching file shared/empcom/auth/user/models.py
patching file wdyt/source/wdyt/reminder/management/commands/send_reminders.py
patching file wdyt/source/wdyt/reminder/tests/test_reminder.py
$ bzr commit --message "RT12430: Test and implement email confirmation reminders."
bzr: ERROR: Bound branch BzrBranch7(file:///home/benf/projects/svn/empowered/) is out of date with master branch SvnBranch('svn+ssh://subversion/home/svn/empowered/trunk').
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.
$ bzr update
Tree is up to date at revision 3490 of branch svn+ssh://subversion/home/svn/empowered/trunk
$ bzr commit --message "RT12430: Test and implement email confirmation reminders."
bzr: ERROR: Bound branch BzrBranch7(file:///home/benf/projects/svn/empowered/) is out of date with master branch SvnBranch('svn+ssh://subversion/home/svn/empowered/trunk').
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.
=====
What went wrong, and how can I fix it?
(Ubuntu Maverick; Bazaar 2.2.4-0ubuntu1; ‘bzr-svn’ 1.0.3-1.)
--
\ “Spam will be a thing of the past in two years' time.” —Bill |
`\ Gates, 2004-01-24 |
_o__) |
Ben Finney
More information about the bazaar
mailing list