I apologize if you receive this twice.
I have now changed my email client to
use plain text by default.
On 13 Oct 2007, at 12:07:12 AM, Jeff King wrote:
except that git-rebase is smart enough to realize that C == C' and
skip
it (so it's a "safe" way of moving forward).
This is good to know! The documentation should mention this case!
However, this will not preserve more complicated history such as
merges
from another git repository.
Correct. Rebasing doesn't really handle merges, but I assumed you were
just making simple commits on top of a cvs master.
Yes, you are quite correct. Your solution will work for me.
However, I think a general solution should be sought out.
Basically, the imported cvs history should be treated like
a remote that's being tracked. It seems like the solution
I proposed kind of does this and would work for other SCM
imports too.
Basically, I want to treat my git repository as the official
repository; the CVS repo is just their for the old farts to get the
latest stuff ;-P
Then my suggestion doesn't really work. You might consider using
git as
the official server and letting the old farts use git-cvsserver.
Unfortunately, they are the ones running the servers; I have to do my
git work behind the scenes.
Thanks,
Michael
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
