From: James Ketrenos <jketreno@linux.intel.com>
To: git@vger.kernel.org
Subject: Getting list of changed objects...
Date: Thu, 14 Jul 2005 13:20:32 -0500 [thread overview]
Message-ID: <42D6ACF0.30303@linux.intel.com> (raw)
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 is easily obtained via:
git-rev-list --objects B ^A
The problem is now when I want to re-sync B with the latest version
of A. What I currently do is:
Create a new C tree based on latest A (2) and then merge B back into
it (3):
git-merge-tree -m $(git-merge-base C B) C B
That works great. I now have a tree with all of the latest A code
and the B changes applied. The problem is now in getting the list
of objects to create the overlay repository.
cg-log -f -r C:B
Will correctly show only those files that have actually changed
between C and B in the first log entry. However, cg-log does
not show me the list of tree objects that have changed between
C and B.
The problem is that if I run:
git-rev-list --objects B ^C
It shows me all of the tree and commit objects but also gives a
list of all of the files that changed between A and C as if they
are needed to move C to B.
Am I overlooking something, misusing things, or ?
Thanks,
James
next reply other threads:[~2005-07-14 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-14 18:20 James Ketrenos [this message]
2005-07-14 17:58 ` Getting list of changed objects Linus Torvalds
2005-07-14 20:20 ` James Ketrenos
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=42D6ACF0.30303@linux.intel.com \
--to=jketreno@linux.intel.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.