Question

I find myself often working with people who are not particularly version control-savvy, so the following use case for Subversion would be very useful, if I knew the magic words.

1. I commit my latest version, note the revision R
2. I email a file off to a collaborator and carry on working, possibly committing more changes as I go
3. When I get the file back from collaborator, I do a 3-way merge of changes from R to their version into my working copy

It seems like branching etc is a bit heavyweight for this, but I’m open to any suggestions of good ways to get the job done.

Answer 1

There could be a simpler solution, but this should work:

1. Start with your working copy clean (i.e., no local changes)
2. Go back to the revision R you previously took note (maybe write it somewhere in the e-mail)
3. Copy your collaborator’s changed file over the file in your working copy@R
4. Update to the latest revision, merging your changes in
5. Commit the merged changes