tests/test-manifest-merging.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 27 Oct 2006 15:02:27 +0200
changeset 3562 88b4755fa48f
parent 3326 be8efb6e1cc6
child 6338 0750f11152fe
permissions -rw-r--r--
httprepo: record the url after a request, makes pull + redirect works POST+redirect doesn't work in python, as a workaround we record the url from the previous GETs so that when we do a POST it uses the redirected url fix issue327

% init foo-base
% create alpha in first repo
adding alpha
% clone foo-base to foo-work
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