Re: [fossil-users] Stash. Was: How should Fossil handle this merge conflict...

2010-12-14 Thread LluĂ­s Batlle i Rossell
On Tue, Dec 14, 2010 at 08:09:58PM -0500, Richard Hipp wrote: > On Tue, Dec 14, 2010 at 11:42 AM, Joshua Paine wrote: > > > > > It would be nice to have something like `git stash`, too. Probably the > > biggest thing I miss from git. > > > > > I've been reading up on git-stash to see if Fossil nee

Re: [fossil-users] Stash. Was: How should Fossil handle this merge conflict...

2010-12-14 Thread Gour
On Tue, 14 Dec 2010 20:09:58 -05 wrote: Richard> So in summary - Fossil appears to already do everything that Richard> git-stash does and do it at least as easily as git-stash. Richard> Furthermore, I think for the sake of usability that is Richard> important to keep Fossil as simple as possible a

[fossil-users] Stash. Was: How should Fossil handle this merge conflict...

2010-12-14 Thread Richard Hipp
On Tue, Dec 14, 2010 at 11:42 AM, Joshua Paine wrote: > > It would be nice to have something like `git stash`, too. Probably the > biggest thing I miss from git. > > I've been reading up on git-stash to see if Fossil needs a similar feature. So far I don't see the need, since stash doesn't do anyt

Re: [fossil-users] How should Fossil handle this merge conflict...

2010-12-14 Thread Joshua Paine
If I have local changes that I haven't checked in, and the merge would conflict with those changes, including by deleting my file, fossil should say something like: Hey, this merge will conflict with your uncommitted changes to: * File X * File Y Commit your changes or use --force to merge anywa