Commits

Author Commit Message Labels Comments Date
brado
Pulled 1.6 fixes from bitbucket.org/02strich/hgfold. Removed my cruft from .hgignore.
Stefan Richter
adding pyo to ignores
Stefan Richter
updating to 1.6
br...@karmicvm
[mq]: winpdb
Steve Borho
named arguments must come before lists
br...@wart
Fixed implied revision bug when updating or merging.
br...@wart
added contact info to source code
br...@wart
Merged in Borho's docstring formatting.
Steve Borho
wrap docstrings at 78 chars for readable help text
br...@wart
removed testing file
br...@wart
proj file change
br...@wart
Bug fixes after Windows test.
br...@wart
Seems to work.
br...@wart
...minor syntax errors, now will test proxies
br...@wart
...using proxy objects behind folddest and foldsource
br...@wart
...works when everything is a filectx
br...@wart
...going to change inheritance of filectx and workingfilectx.
br...@wart
...clone workaround: hg clone -U; hg update --fold. Fold works clobbering okay. Now need to make merge tolerant.
br...@wart
merged
br...@wart
...another approach to to folding file contexts
br...@wart
tried splitting into folddest/foldsource, but got stuck
br...@wart
Added tag works for changeset 4bb9a0a68e98
br...@wart
...still refining action2way.resolve() to handle wierd parentage
Tags
works
br...@wart
bugs, all surrounding resolve's fca
br...@wart
working on merge update
br...@wart
Added tag about_to_fold_into_wc for changeset d4d6b8317e76
br...@wart
adjusting naming
Tags
about_to_fold_into_wc
br...@wart
changed cmp to find ancestor and properly return an int.
br...@wart
revised tests
br...@wart
Refined ancestor logic and abort if dirty logic.
  1. Prev
  2. Next