Bug 338566

Description sam 2011-03-01 12:37:01 EST

Build Identifier: 20100218-1602

The new 'Compare With' options that work on folder level, are really nice and user-friendly. A fantastic improvement!

It would be nice - and consistent - if the 'Replace With' options were identical.

Semantically, I would expect this to operate in exactly the same manner as if you were to take the files (perhaps from a totally separate checkout) and plonk them into your current working directory.

I realise that this feature can be 'abused' (for example you could do this when you really need to be merging something, which would obviously cause a mess) but a common use case would be:

- You are working on a developer branch.
- You screw up a file or folder.
- You already committed this change, and maybe a bunch of others, maybe not very logically separated, maybe several of them affecting this folder. Maybe there are also some uncommitted changes in there. Eventually...
- You want to go back to the version in the current core branch (or from the commit that your original branch was based on [*], or something).

There are other ways to do this but 'Replace with' is really nice and simple and particularly given the symmetry with 'Compare with' it is a bit disappointing that it's not present.

[*] It would be nice to have a 'Compare/Replace with > Start of branch' or something, too (equiv to "git diff master...branch"). This stops working well if you do any merges, though, and you can do it already with the existing 'Commit' option, so I'm not so certain it's necessary.

PS I searched for this request but didn't find it; apologies if this is a duplicate or if it's already done in latest dev builds.

Reproducible: Always

Steps to Reproduce:
1. Choose 'Compare with'. Note several very nice options.
2. Choose 'Replace with'. Note much fewer options. :(