mirror of
https://github.com/NixOS/nix.git
synced 2025-11-26 04:00:59 +01:00
Fixed bugs, cleaned up some code
This commit is contained in:
parent
afb445957d
commit
bc2fbabc12
6 changed files with 74 additions and 57 deletions
|
|
@ -10,6 +10,4 @@ if [ "$#" != 4 ] ; then
|
|||
exit 1;
|
||||
fi
|
||||
|
||||
cd $statepath
|
||||
$svnbin merge -r HEAD:$torevision $repos
|
||||
cd -
|
||||
$svnbin merge -r HEAD:$torevision $repos $statepath
|
||||
|
|
|
|||
|
|
@ -10,6 +10,4 @@ if [ "$#" != 4 ] ; then
|
|||
exit 1;
|
||||
fi
|
||||
|
||||
cd $statepath
|
||||
$svnbin merge -r HEAD:$torevision $repos
|
||||
cd -
|
||||
$svnbin merge -r HEAD:$torevision $repos $statepath
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue