Hi,
I'm new to fossil and not quite shure if this is a bug or a lack of
understanding on my part.
I wanted to stash a newly added file, then apply the stash to another
(feature-)branch.
Fossil worked as I had expected. At least it said so...
c:\workspace>ver
Microsoft Windows [Version 6.3.9600]
c:\workspace>fossil init test.fossil
project-id: 7805e88c40ce591187ce9bf5171ddbe8a0ec3357
server-id: 769e90784fb4622f5007a26e39ee4d9608228021
admin-user: admin (initial password is "4e4822")
c:\workspace>fossil open test.fossil
project-name: <unnamed>
repository: c:/workspace/test.fossil
local-root: c:/workspace/
config-db: C:/Users/admin/AppData/Local/_fossil
project-code: 7805e88c40ce591187ce9bf5171ddbe8a0ec3357
checkout: be310e315ee733cfa10d1038fec7a5f89130b2cc 2014-03-08 17:40:47 UTC
tags: trunk
comment: initial empty check-in (user: admin)
checkins: 1
c:\workspace>dir
Directory of c:\workspace
08.03.2014 18:41 <DIR> .
08.03.2014 18:41 <DIR> ..
08.03.2014 18:41 58.368 test.fossil
08.03.2014 18:41 7.168 _FOSSIL_
2 File(s) 65.536 bytes
2 Dir(s) 8.336.400.384 bytes free
c:\workspace>echo line1>main
c:\workspace>fossil add main
ADDED main
c:\workspace>fossil ci -m main
New_Version: aa095194ec545530135d9f3eeac27065ac7e6ecd
c:\workspace>echo line1>newfeature
c:\workspace>fossil add newfeature
ADDED newfeature
c:\workspace>fossil ci --branch branch1 -m newfeature
New_Version: 63049c3042e725482950c0cbe529a8943a104c54
c:\workspace>fossil branch
* branch1
trunk
c:\workspace>fossil up trunk
REMOVE newfeature
-------------------------------------------------------------------------------
updated-to: aa095194ec545530135d9f3eeac27065ac7e6ecd 2014-03-08 17:42:06 UTC
tags: trunk
comment: main (user: admin)
changes: 1 file modified.
"fossil undo" is available to undo changes to the working checkout.
c:\workspace>echo line1>test
c:\workspace>echo line2>>main
c:\workspace>fossil add test
ADDED test
c:\workspace>fossil extra
c:\workspace>fossil changes
EDITED main
ADDED test
c:\workspace>fossil stash
C:\Windows\notepad.exe "./ci-comment-655133848A97.txt"
REVERTED: main
UNMANAGE: test
c:\workspace>fossil extra
test
c:\workspace>fossil update branch1
ADD newfeature
-------------------------------------------------------------------------------
updated-to: 63049c3042e725482950c0cbe529a8943a104c54 2014-03-08 17:43:22 UTC
tags: branch1
comment: ADDED newfeature (user: admin)
changes: 1 file modified.
"fossil undo" is available to undo changes to the working checkout.
c:\workspace>fossil stash diff
CHANGED main
--- main
+++ main
@@ -1,1 +1,2 @@
line1
+line2
ADDED test
Index: test
==================================================================
--- test
+++ test
@@ -0,0 +1,1 @@
+line1
c:\workspace>fossil stash apply
UPDATE main
ADD test
"fossil undo" is available to undo changes to the working checkout.
c:\workspace>fossil extra
test
c:\workspace>fossil changes
EDITED main
c:\workspace>type main
line1
line2
c:\workspace>type test
line1
c:\workspace>fossil stash goto
REMOVE newfeature
-------------------------------------------------------------------------------
updated-to: aa095194ec545530135d9f3eeac27065ac7e6ecd 2014-03-08 17:42:06 UTC
tags: trunk
comment: main (user: admin)
changes: 1 file modified.
MERGE main
ADD test
"fossil undo" is available to undo changes to the working checkout.
c:\workspace>fossil branch
branch1
* trunk
c:\workspace>dir
Directory of c:\workspace
08.03.2014 19:04 <DIR> .
08.03.2014 19:04 <DIR> ..
08.03.2014 19:04 14 main
08.03.2014 19:04 7 test
08.03.2014 18:43 58.368 test.fossil
08.03.2014 19:04 17.408 _FOSSIL_
4 File(s) 75.797 bytes
2 Dir(s) 7.889.629.184 bytes free
c:\workspace>fossil changes
EDITED main
c:\workspace>fossil extra
test
Fossil did record the addition of file "test" to the stash, it even said it
applied it on both occasions (stash apply, stash goto).
So why did the file remain "unmanaged"?
Regards
Oliver
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
