tests/test-manifest-merging.out
author Sune Foldager <cryo@cyanite.org>
Mon, 11 May 2009 07:55:13 +0200
changeset 8344 873429914ec5
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
url: fix bug in passwordmgr related to auth configuration Usernames given as part of the URL would be ignored. This bug was introduced in 89c80c3dc5842d609e9ba13f08fd2cf7f127c25a

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create beta in second repo
adding beta
% create gamma in first repo
adding gamma
% pull into work and merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge
2 files updated, 0 files merged, 0 files removed, 0 files unresolved