On Sat, 18 Dec 2010 16:45:39 -0500 >>>>>> "Richard" == Richard Hipp wrote:
Richard> Once I get a bunch of you, gentle readers, to come back and
Richard> say "I tried the stash and it is working great for me - no
Richard> bugs!" then I'll push up a new set of precompiled binaries.
I've played a bit with stash command and it's very nice add-on in
Fossil.
Tried all the different commands and found one problem...
Here is the 'log':
[g...@atmarama stash] fossil stat
repository: /home/gour/tmp/fossil/stash.fossil
local-root: /home/gour/tmp/fossil/stash/
server-code: 373f31144a1d4e5c79d42eb7dd4a1dfe96e8f674
checkout: 35345807bcfe3a6fecdcc61c9895318f2113b40c 2010-12-19
08:29:55 UTC
parent: e83af57592aa4f0207021698e206254aabc04775 2010-12-19
08:27:56 UTC
tags: trunk
comment: initial import (user: gour)
EDITED emacs/emacs.el
EDITED misc/Xdefaults
[g...@atmarama stash] fossil stash list
3: [35345807bcfe3a] on 2010-12-19 08:37:16
3rd stash test
1: [35345807bcfe3a] on 2010-12-19 08:31:46
stash save test
[g...@atmarama stash] fossil diff
Index: emacs/emacs.el
===================================================================
--- emacs/emacs.el
+++ emacs/emacs.el
@@ -24,10 +24,12 @@
;; disable VC
(setq vc-handled-backends nil)
;; DVC
+
+;; 4th stash test
(require 'dvc-autoloads)
;; start server
(server-start)
Index: misc/Xdefaults
===================================================================
--- misc/Xdefaults
+++ misc/Xdefaults
@@ -18,6 +18,8 @@
Emacs*toolBar: 0
Emacs*font: Inconsolata-16
Emacs.FontBackend: xft
Xft.antialias: 1
-Xft.dpi: 97
+
+# test for stash-save
+#Xft.dpi: 97
[g...@atmarama stash] fossil ci -m "applied stash #1 & #4"
New_Version: 27100ca78bfc92133c986803f14345b9aa56e7f4
[g...@atmarama stash] fossil stat
repository: /home/gour/tmp/fossil/stash.fossil
local-root: /home/gour/tmp/fossil/stash/
server-code: 373f31144a1d4e5c79d42eb7dd4a1dfe96e8f674
checkout: 27100ca78bfc92133c986803f14345b9aa56e7f4 2010-12-19
08:50:53 UTC
parent: 35345807bcfe3a6fecdcc61c9895318f2113b40c 2010-12-19
08:29:55 UTC
tags: trunk
comment: applied stash #1 & #4 (user: gour)
[g...@atmarama stash] fossil stash list
3: [35345807bcfe3a] on 2010-12-19 08:37:16
3rd stash test
1: [35345807bcfe3a] on 2010-12-19 08:31:46
stash save test
[g...@atmarama stash] fossil stash diff 1
CHANGED misc/Xdefaults
--- misc/Xdefaults
+++ misc/Xdefaults
So, we can see that the 'stash test #1' is 'applied'.
Now, let's try to apply it & drop it...
[g...@atmarama stash] fossil stash apply 1
CONFLICT misc/Xdefaults
WARNING: merge conflicts - see messages above for details.
"fossil undo" is available to undo changes to the working checkout.
Oops...
[g...@atmarama stash] cat misc/Xdefaults
[...]
Emacs*toolBar: 0
Emacs*font: Inconsolata-16
Emacs.FontBackend: xft
Xft.antialias: 1
<<<<<<< BEGIN MERGE CONFLICT: original content first <<<<<<<
# test for stash-save
#Xft.dpi: 97======= original content above; conflict below
#=============
# test for stash-save
#Xft.dpi: 97>>>>>>> END MERGE CONFLICT: conflict last >>>>>>>>>>>>>>>>>>
So, we would like that Fossil is smart-enough to find out there is no
conflict here.
Possible?
Otherwise, everything worked perfectly.
Sincerely,
Gour
--
Gour | Hlapicina, Croatia | GPG key: CDBF17CA
----------------------------------------------------------------
signature.asc
Description: PGP signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
