On 08/16/12 08:58, Paul Backhouse wrote: > On Thu, 2012-08-16 at 10:39 -0300, Tomas Neme wrote: >> Well, if you push without pulling, this might happen, > > *Implicit git usage* :D > > I'd expect git to squeal about it being a non-fast-forward commit.
Git should, though other VCSes might notice that the two files don't have the same name, so they aren't a "conflict" for purposes of committing. Subversion (1.6.12 tested here) in particular seems to allow this: ~/tmp$ svnadmin create repo ~/tmp$ svn co file:///$PWD/repo a ~/tmp$ svn co file:///$PWD/repo b ~/tmp$ cd a ~/tmp/b$ cd ../a ~/tmp/a$ echo one > 001_a.txt ~/tmp/a$ svn add 001_a.txt ~/tmp/a$ svn commit -m "a/001_a.txt" ~/tmp/a$ cd ../b ~/tmp/b$ echo two > 001_b.txt ~/tmp/b$ svn add 001_b.txt ~/tmp/b$ # note: no requirement to update before commit ~/tmp/b$ svn commit -m "b/001_b.txt" 001_b.txt Even if you pull and then push, you still have to be cognizant enough to realize that there are now two 001_* files in the repo. Such might be ameliorated with some sort of pre-commit hook to check for migrations with the same serial number. -tkc -- You received this message because you are subscribed to the Google Groups "Django users" group. To post to this group, send email to django-users@googlegroups.com. To unsubscribe from this group, send email to django-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-users?hl=en.
