Merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-6 into lp:ubuntuone-client/stable-1-6
Proposed by
Alejandro J. Cura
Status: | Rejected |
---|---|
Rejected by: | dobey |
Proposed branch: | lp:~alecu/ubuntuone-client/timestamp-autofix-1-6 |
Merge into: | lp:ubuntuone-client/stable-1-6 |
Diff against target: |
237 lines (+80/-26) 3 files modified
Makefile.am (+1/-1) tests/syncdaemon/test_action_queue.py (+65/-12) ubuntuone/syncdaemon/action_queue.py (+14/-13) |
To merge this branch: | bzr merge lp:~alecu/ubuntuone-client/timestamp-autofix-1-6 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Diego Sarmentero (community) | Abstain | ||
Review via email: mp+82754@code.launchpad.net |
Commit message
Do a HEAD request on the server to get accurate timestamp (LP: #692597)
Description of the change
Do a HEAD request on the server to get accurate timestamp (LP: #692597)
This branch depends on:
* lp:~alecu/ubuntuone-storage-protocol/timestamp-autofix-1-6
* lp:~alecu/ubuntu-sso-client/timestamp-autofix-1-2
To build it on linux, point autogen to the dependent branches, like this:
./autogen.sh --with-
To post a comment you must log in.
Unmerged revisions
- 974. By Alejandro J. Cura
-
fix u1trial parameters
- 973. By Alejandro J. Cura
-
Do a HEAD request on the server to get accurate timestamp (LP: #692597)
Text conflict in bin/ubuntuone- syncdaemon syncdaemon- authentication. c linux/eventlog/ test_zg_ listener. py linux/test_ dbus.py test_tools. py test_aggregator .py n/test_ action_ queue.py n/test_ config. py n/test_ fsm.py n/test_ localrescan. py syncdaemon/ action_ queue.py syncdaemon/ tritcask. py
Text conflict in configure.ac
Text conflict in libsyncdaemon/
Conflict adding files to nautilus. Created directory.
Conflict because nautilus is not versioned, but has versioned children. Versioned directory.
Contents conflict in nautilus/utils.c
Text conflict in tests/platform/
Text conflict in tests/platform/
Text conflict in tests/platform/
Text conflict in tests/status/
Text conflict in tests/syncdaemo
Text conflict in tests/syncdaemo
Text conflict in tests/syncdaemo
Text conflict in tests/syncdaemo
Text conflict in ubuntuone/
Text conflict in ubuntuone/
16 conflicts encountered.