Re: git and bzr

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Nicholas Allen
Date: Tuesday, November 28, 2006 - 11:58 am

> There are trouble with file-ids. Most common example is trouble with file

Do you mean if the 2 files should be merged into 1 file? If they should 
be 2 files with different names there is no problem using file 
identifiers but if they should be merged into one file then I can see 
that this would cause problems. You would have to delete one of the 
files and copy its changes into the other which would create conflicts 
when that file is modified in the other branch. This is a problem if you 
*only* have file identifiers.

But if you tracked both file identifiers *and* content identifiers (as I 
was trying to say in my first post) this wouldn't be a problem would it? 
When content is changed you use the content identifiers but when files 
are changed by renaming or deleting you use file identifiers. To me at 
least it doesn't seem like it's a choice of one or the other or that one 
is stupid and the other isn't but that you need them both. bzr uses file 
ids and git uses content ids. It would be nice if there were an RCS 
that  used both - then you get the best of both worlds don't you?

So I don't think you want to use file identifiers to track changes to 
content (as bzr would do in this case) and you don't want to use content 
identifiers to track changes to files (as git does, to my understanding, 
when a file is renamed).

Nick

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: git and bzr, Jakub Narebski, (Tue Nov 28, 11:06 am)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 11:58 am)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 12:11 pm)
Re: git and bzr, Andy Parkins, (Tue Nov 28, 12:40 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 1:37 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 2:26 pm)
Re: git and bzr, Martin Langhoff, (Tue Nov 28, 2:40 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 2:49 pm)
Re: git and bzr, Shawn Pearce, (Tue Nov 28, 2:53 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 3:00 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 3:13 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 3:25 pm)
Re: git and bzr, Linus Torvalds, (Tue Nov 28, 3:41 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 3:46 pm)
Re: git and bzr, Nicholas Allen, (Tue Nov 28, 3:48 pm)
Re: git and bzr, Johannes Schindelin, (Wed Nov 29, 3:49 am)
Re: git and bzr, Johannes Schindelin, (Wed Nov 29, 3:52 am)
Re: git and bzr, Jakub Narebski, (Wed Nov 29, 4:01 am)
Re: git and bzr, Linus Torvalds, (Wed Nov 29, 10:29 am)
Re: git and bzr, Marko Macek, (Wed Nov 29, 11:54 am)
Re: git and bzr, Johannes Schindelin, (Wed Nov 29, 1:07 pm)
Re: git and bzr, Jon Loeliger, (Wed Nov 29, 1:37 pm)
Re: git and bzr, Linus Torvalds, (Wed Nov 29, 1:45 pm)
Re: git and bzr, Jakub Narebski, (Wed Nov 29, 1:49 pm)
Re: git and bzr, Carl Worth, (Wed Nov 29, 5:05 pm)
Re: git and bzr, Carl Worth, (Wed Nov 29, 5:08 pm)
Re: git and bzr, Raimund Bauer, (Wed Nov 29, 11:59 pm)
Re: git and bzr, Carl Worth, (Thu Nov 30, 12:17 am)
Re: git and bzr, Alan Chandler, (Thu Nov 30, 1:31 am)
Re: git and bzr, Nguyen Thai Ngoc Duy, (Thu Nov 30, 2:01 am)
Re: git and bzr, Alan Chandler, (Thu Nov 30, 2:30 am)
Re: git and bzr, Steven Grimm, (Thu Nov 30, 2:39 am)
Re: git and bzr, Johannes Schindelin, (Thu Nov 30, 3:19 am)
Re: git and bzr, Nguyen Thai Ngoc Duy, (Thu Nov 30, 4:25 am)
Re: git and bzr, Johannes Schindelin, (Thu Nov 30, 5:23 am)
Re: git and bzr, Andreas Ericsson, (Thu Nov 30, 5:25 am)
Re: git and bzr, Andreas Ericsson, (Thu Nov 30, 5:45 am)
Re: git and bzr, Theodore Tso, (Thu Nov 30, 1:01 pm)