, which was already used in
cg-commit
for something else.
Signed-off-by: James Ketrenos <[EMAIL PROTECTED]>
---
cg-commit | 46 +-
1 files changed, 45 insertions(+), 1 deletions(-)
b07037397659763271e946fc15c0b3c61a8fcdfa
diff --git a/cg-commi
I use the attached patch here and its helped me quite a bit. Thought
I'd send it out for others to use as well. Prior to 0.12 I could do
this in my own scripts after a cg-merge exited with conflicts. Resently
it seems 'git-ls-files --unmerged' will no longer list any files that
had conflicts dur
Linus Torvalds wrote:
>Since you haven't merged A and B in the above, they _are_ needed, aren't
>they?
>
>
My original email wasn't worded quite right. I think you are tracking
what I'm trying to do... but here is a different view anyway:
time
|
1 A ---> B clone A to B
2 |
I have the following tree path:
A C B
| |
| 3.|<--.
| | |
2.|-->' |
| |
1.|-->'
|
Where A is the root repository for my overlays. B was created by
cloning A (1)
B is where development has been progressing. Finding the set of
objects to move from A to B i
-p ${dst} || die 5 "Error creating '${dst}'")
dst=`readlink -f ${dst}`/
pull-delta-repo $src $dst || exit 1
echo ""
echo "${2} now contains the full tree from ${1}."
echo -e "\nTo sync the files to the cache state, run:"
echo -e "\t% cd ${2}&quo
5 matches
Mail list logo
