On Mon, Sep 15, 2008 at 09:12:01PM -0700, David Brown wrote: > A simple way to be paranoid would be something (shell-ish) like: > > p4 print filename | collapse-keywords | git hash-object --stdin > > and make sure that is the version we think the file should have > started with. I think we're really just making sure we didn't miss a > P4 change that someone else made underneath, and we're about to back > out. > Even this isn't robust from p4's point of view. The p4 model is to do > a 'p4 edit' on the file, and then the later 'p4 submit' will give an > error if someone else has updated the file. This would require using > p4's conflict resolution, and I'm guessing someone using git-p4 would > rather abort the submit and rebase. How about collapsing the keywords in the _p4_ version after "p4 edit" but before applying the patch, and just "p4 submit" the collapsed version if patching succeeds? As pointed out earlier in this thread, p4 submit doesn't care about whether keywords are expanded or not anyway. Cheers. -- Jing Xue -- 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
