Fri, 24 Jun 2011 23:25:42 +0300 backout of d04ba50e104d: allow to qpop/push with a dirty working copy stable
Idan Kamara <idankk86@gmail.com> [Fri, 24 Jun 2011 23:25:42 +0300] rev 14732
backout of d04ba50e104d: allow to qpop/push with a dirty working copy The new behavior was breaking existing tools that relied on a sequence such as this: 1) start with a dirty working copy 2) qimport some patch 3) try to qpush it 4) old behavior would fail at this point due to outstanding changes. (new behavior would only fail if the outstanding changes and the patches changes intersect) 5) innocent user qrefreshes, gets his local changes in the imported patch It's worth considering if we can move this behavior to -f in the future.
Fri, 24 Jun 2011 13:35:44 -0500 merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:44 -0500] rev 14731
merge with stable
Fri, 24 Jun 2011 13:35:03 -0500 merge with stable stable
Matt Mackall <mpm@selenic.com> [Fri, 24 Jun 2011 13:35:03 -0500] rev 14730
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip