|
@@ -38,13 +38,17 @@ p4backout() {
|
|
|
fi
|
|
fi
|
|
|
local changenum="$1"
|
|
local changenum="$1"
|
|
|
local target_stage="@${2}"
|
|
local target_stage="@${2}"
|
|
|
- if [[ ${target_stage} == "@HEAD" ]]; then target_stage=""; fi
|
|
|
|
|
local lastchange=$((changenum-1))
|
|
local lastchange=$((changenum-1))
|
|
|
|
|
+
|
|
|
p4 sync @$lastchange
|
|
p4 sync @$lastchange
|
|
|
p4 edit ...
|
|
p4 edit ...
|
|
|
p4 sync @$changenum
|
|
p4 sync @$changenum
|
|
|
p4 resolve -ay
|
|
p4 resolve -ay
|
|
|
- p4 sync $target_stage
|
|
|
|
|
|
|
+ if [[ ${target_stage} == "@HEAD" ]]; then
|
|
|
|
|
+ p4 sync
|
|
|
|
|
+ else
|
|
|
|
|
+ p4 sync $target_stage
|
|
|
|
|
+ fi
|
|
|
p4 resolve -am
|
|
p4 resolve -am
|
|
|
}
|
|
}
|
|
|
|
|
|