← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_missing.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_missing.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Black-box tests for bzr missing."""
18
18
 
63
63
        b_tree.commit(message='more')
64
64
 
65
65
        # run missing in a against b
66
 
        # this should not require missing to take out a write lock on a 
 
66
        # this should not require missing to take out a write lock on a
67
67
        # or b. So we take a write lock on both to test that at the same
68
68
        # time. This may let the test pass while the default branch is an
69
69
        # os-locking branch, but it will trigger failures with lockdir based
100
100
        lines3 = self.run_bzr('missing ../b --theirs-only', retcode=0)[0]
101
101
        self.assertEqualDiff('Other branch is up to date.\n', lines3)
102
102
 
103
 
        # relative to a, missing the 'merge' commit 
 
103
        # relative to a, missing the 'merge' commit
104
104
        os.chdir('../b')
105
105
        lines = self.run_bzr('missing ../a', retcode=1)[0].splitlines()
106
106
        self.assertEqual(missing, lines[0])