Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-symlink-basic.out
author Maxim Dounin <mdounin@mdounin.ru>
Sat, 27 Oct 2007 16:27:55 +0400
changeset 5483 0c43f87baba3
parent 5405 8feb33c2d153
permissions -rw-r--r--
Fix file-changed-to-dir and dir-to-file commits (issue660). Allow adding to dirstate files that clash with previously existing but marked for removal. Protect from reintroducing clashes by revert. This change doesn't address related issues with update. Current workaround is to do "clean" update by manually removing conflicting files/dirs from working directory.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4570
6a8e1dd18ba2 commands.commit: symlinks are supported
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 4264
diff changeset 
     1
 
abort: file .../test-symlink-basic/a/dangling not tracked!
4264
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
changeset:   0:cabd88b706fc
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
tag:         tip
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
user:        test
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
date:        Thu Jan 01 00:00:00 1970 +0000
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
files:       dangling
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 
description:
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     8
 
add symlink
af4f0d52f948 Add some tests for symlink tracking
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     9
 












af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    10









5405






8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
4570

diff
changeset




    11


2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling








4264






af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    12


% rev 0:













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    13


dangling -> nothing













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    14


% rev 1:













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    15


dangling -> void













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    16


% modifying link













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    17


dangling -> empty













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    18


% reverting to rev 0:













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    19


reverting dangling













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    20


dangling -> nothing













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    21


% backups:













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    22


dangling.orig -> empty













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    23


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    24


% copies













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    25


copying dangling to dangling2













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    26


A dangling2













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    27


  dangling













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    28


dangling -> void













af4f0d52f948
Add some tests for symlink tracking



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    29


dangling2 -> void















mercurial-crew-with-dirclash