francois / piston

Piston is a utility that eases vendor branch management. This repository is a complete reimplementation of Piston to provide different backends, depending on the repositories and working copies you pistonize from. 

Don't copy .piston.yml, it fixes import from a pistonized repository
scambra (author)
Mon Apr 13 03:52:06 -0700 2009
francois (committer)
Mon Apr 13 06:48:33 -0700 2009
commit  b46f6e9d5333b6dfb7c85c5872d983e5266de929
tree    078b966229e4a3159ce2adbc9856e07f68df909f
parent  91c22326e6957804b5facb86df36fbbab18e0cf9
piston / TODO
100644 7 lines (5 sloc) 0.466 kb
raw blame history 
1
2
3
4
5
6
7

= Integration tests to verify
 
* Port conflicts in temporary checkout directory to working copy:
It detects and marks conflicts with changes after last update. But when some changes, which were made before last update, conflict when merging in temporary directory, file is merged correctly but conflicts are not marked
In Piston 1.x old changes were lost, even without conflicts
* Force addition of Git repositories, because the files might be ignored in .gitignore