Viewing all changes in revision 1614.2.6.
- Committer: Olaf Conradi
- Date: 2006-03-27 21:08:19 UTC
- mto: (1661.1.1 bzr.mbp.remember)
- mto: This revision was merged to the branch mainline in revision 1663.
- Revision ID: olaf@conradi.org-20060327210819-c12de75f9f81dfb8
Add testcase for --remember when merge fails. It should still remember
the location. Testcase exposed a bug. When merge raised an exception,
the location was not remembered. Fixed by moving remember code before
actual merging.
the location. Testcase exposed a bug. When merge raised an exception,
the location was not remembered. Fixed by moving remember code before
actual merging.
- files modified:
- bzrlib/builtins.py
expand all
collapse all
added
removed
