Skip to content

Worktree is not clean. Skip merging repo #733

Closed
Semmelbroesel24 opened this Issue Jul 17, 2014 · 1 comment

2 participants

@Semmelbroesel24

What can i do if i have this Problem?

[07/17/14 07:49:12] Worktree changes (at most 5 files are shown):
[07/17/14 07:49:12] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.pdf, ce mtime: 1404914399, ce size: 2809825, file mtime: 1404915710, file size: 2813419
[07/17/14 07:49:12] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.ai, ce mtime: 1404914359, ce size: 5582998, file mtime: 1404915679, file size: 5635581
[07/17/14 07:49:12] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.pdf, ce mtime: 1404911553, ce size: 7562246, file mtime: 1404915500, file size: 7565608
[07/17/14 07:49:12] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.ai, ce mtime: 1404911473, ce size: 11699402, file mtime: 1404915461, file size: 11798939
[07/17/14 07:49:12] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/11_xxx_blau.pdf, ce mtime: 1404910917, ce size: 7805179, file mtime: 1404915367, file size: 7809688
[07/17/14 07:49:12] sync-mgr.c(632): Worktree is still dirty after commit.
[07/17/14 07:49:12] sync-mgr.c(659): [sync mgr] Worktree is not clean. Skip merging repo Design Goldbuch(069a42af).
[07/17/14 07:49:12] sync-mgr.c(529): Repo 'Design Goldbuch' sync state transition from merging to 'error': 'Files changed in local folder, skip merge.'.
[07/17/14 07:49:12] sync-mgr.c(471): Repo 'Design Goldbuch' sync state transition from 'initializing' to 'merging'.
[07/17/14 07:49:20] Worktree changes (at most 5 files are shown):
[07/17/14 07:49:20] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.pdf, ce mtime: 1404914399, ce size: 2809825, file mtime: 1404915710, file size: 2813419
[07/17/14 07:49:20] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.ai, ce mtime: 1404914359, ce size: 5582998, file mtime: 1404915679, file size: 5635581
[07/17/14 07:49:20] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.pdf, ce mtime: 1404911553, ce size: 7562246, file mtime: 1404915500, file size: 7565608
[07/17/14 07:49:20] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.ai, ce mtime: 1404911473, ce size: 11699402, file mtime: 1404915461, file size: 11798939
[07/17/14 07:49:20] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/11_xxx_blau.pdf, ce mtime: 1404910917, ce size: 7805179, file mtime: 1404915367, file size: 7809688
[07/17/14 07:49:44] Worktree changes (at most 5 files are shown):
[07/17/14 07:49:44] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.pdf, ce mtime: 1404914399, ce size: 2809825, file mtime: 1404915710, file size: 2813419
[07/17/14 07:49:44] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.ai, ce mtime: 1404914359, ce size: 5582998, file mtime: 1404915679, file size: 5635581
[07/17/14 07:49:44] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.pdf, ce mtime: 1404911553, ce size: 7562246, file mtime: 1404915500, file size: 7565608
[07/17/14 07:49:44] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.ai, ce mtime: 1404911473, ce size: 11699402, file mtime: 1404915461, file size: 11798939
[07/17/14 07:49:44] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/11_xxx_blau.pdf, ce mtime: 1404910917, ce size: 7805179, file mtime: 1404915367, file size: 7809688
[07/17/14 07:49:44] sync-mgr.c(632): Worktree is still dirty after commit.
[07/17/14 07:49:44] sync-mgr.c(659): [sync mgr] Worktree is not clean. Skip merging repo Design Goldbuch(069a42af).
[07/17/14 07:49:44] sync-mgr.c(529): Repo 'Design Goldbuch' sync state transition from merging to 'error': 'Files changed in local folder, skip merge.'.
[07/17/14 07:49:45] sync-mgr.c(471): Repo 'Design Goldbuch' sync state transition from 'initializing' to 'merging'.
[07/17/14 07:49:53] Worktree changes (at most 5 files are shown):
[07/17/14 07:49:53] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.pdf, ce mtime: 1404914399, ce size: 2809825, file mtime: 1404915710, file size: 2813419
[07/17/14 07:49:53] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.ai, ce mtime: 1404914359, ce size: 5582998, file mtime: 1404915679, file size: 5635581
[07/17/14 07:49:53] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.pdf, ce mtime: 1404911553, ce size: 7562246, file mtime: 1404915500, file size: 7565608
[07/17/14 07:49:53] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.ai, ce mtime: 1404911473, ce size: 11699402, file mtime: 1404915461, file size: 11798939
[07/17/14 07:49:53] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/11_xxx_blau.pdf, ce mtime: 1404910917, ce size: 7805179, file mtime: 1404915367, file size: 7809688
[07/17/14 07:50:18] Worktree changes (at most 5 files are shown):
[07/17/14 07:50:18] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.pdf, ce mtime: 1404914399, ce size: 2809825, file mtime: 1404915710, file size: 2813419
[07/17/14 07:50:18] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/68016_blau_back.ai, ce mtime: 1404914359, ce size: 5582998, file mtime: 1404915679, file size: 5635581
[07/17/14 07:50:18] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.pdf, ce mtime: 1404911553, ce size: 7562246, file mtime: 1404915500, file size: 7565608
[07/17/14 07:50:18] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/19_xxx_blau.ai, ce mtime: 1404911473, ce size: 11699402, file mtime: 1404915461, file size: 11798939
[07/17/14 07:50:18] type: W, status: M, name: Kollektionen/Kollektion_2015/Kommunion & Konfirmation/Entwürfe/blau/druck/11_xxx_blau.pdf, ce mtime: 1404910917, ce size: 7805179, file mtime: 1404915367, file size: 7809688
[07/17/14 07:50:18] sync-mgr.c(632): Worktree is still dirty after commit.

@killing
haiwen member
killing commented Aug 2, 2014

After upgrading to 3.1 client, if your library is created with 3.x server, this problem should not happen any more. You can also try resyncing it.

@killing killing closed this Aug 2, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.