Canonical Design Blog: Design museum exhibition London
Something exciting Next year
Bruno Maag from Dalton Maag has been asked by the Design Museum London to put on an exhibition of his work. This is a collaboration between ourselves and DM,
the exhibition will be in two parts a substantial part of which will be featuring the Ubuntu font.
Does anyone have any favorite mobile tech sites they want me to look at while I'm considering the next phase of mobile redesign?
My idea is to build a new mobile design without using any forum framework (do not use vBulletin, XenForo, etc.) and do not use any big SPA Javascript frameworks (do... (2 Replies)
Hi all,
I'm seeking an efficient and secure means of providing multiple named users access to files by their functional areas. For security, I've chosen SFTP using key pair authentication.
The general principle is we have multiple users as follows:
We have two type of files for Function... (2 Replies)
I need to create a script to automate creating a deployment for me by taking into consideration two input files.
1. design file of entire database, it has the entire database create statements.
2. logs which point to database objects that need to be fixed like below:
... (2 Replies)
I've notepad in which logs are present. I need to design a web page by which if some one paste their ticket number and click on "search" the logs for that ticket number should be displayed at the bottom.
I need some advice on how to do this and which is the right platform to do this.
Regards... (1 Reply)
Hi,
I am working on a project to develop an embedded device that can transfer files between two usb devices ( pen drives). We are using an NUC950A ARM9 microcontroller and we've put the Linux 2.1 kernel on the development board and it works. Can i use nano -x to design my own GUI so that i can run... (3 Replies)
i want to design the shell for some basic commands such as cp mkdir rm mv etc... so please let me know how to start and wich all books to refer and if any body is having the model just mail me at, devskamat018@gmail.com:) i will be waiting please reply soon (1 Reply)
i want to make a shell program.
This program i give a current day and the result is to appear
the celebrity and birthday(birthday and celebration is 2 txt files).
In addition this procedure must do for a space day in future or past depend
on user choice. Finally the program can run and as... (2 Replies)
Can anybody tell me what is the best website or books to read for getting good knowledge in doing C++ class design. Please leave cplusplus.com or bjorne stroustrup. Other than these is there any website or book. Please do tell me (0 Replies)
RCSMERGE(1L)RCSMERGE(1L)NAME
rcsmerge - merge RCS revisions
SYNOPSIS
rcsmerge -rrev1 [ -rrev2 ] [ -p ] file
DESCRIPTION
Rcsmerge incorporates the changes between rev1 and rev2 of an RCS file into the corresponding working file. If -p is given, the result is
printed on the standard output, otherwise the result overwrites the working file.
A file name ending in ',v' is an RCS file name, otherwise a working file name. Merge derives the working file name from the RCS file name
and vice versa, as explained in co(1L). A pair consisting of both an RCS and a working file name may also be specified.
Rev1 may not be omitted. If rev2 is omitted, the latest revision on the default branch (normally the highest branch on the trunk) is
assumed. Both rev1 and rev2 may be given numerically or symbolically.
Rcsmerge prints a warning if there are overlaps, and delimits the overlapping regions as explained in co -j. The command is useful for
incorporating changes into a checked-out revision.
EXAMPLES
Suppose you have released revision 2.8 of f.c. Assume furthermore that you just completed revision 3.4, when you receive updates to release
2.8 from someone else. To combine the updates to 2.8 and your changes between 2.8 and 3.4, put the updates to 2.8 into file f.c and exe-
cute
rcsmerge -p-r2.8-r3.4 f.c >f.merged.c
Then examine f.merged.c. Alternatively, if you want to save the updates to 2.8 in the RCS file, check them in as revision 2.8.1.1 and exe-
cute co -j:
ci -r2.8.1.1 f.c
co -r3.4 -j2.8:2.8.1.1 f.c
As another example, the following command undoes the changes between revision 2.4 and 2.8 in your currently checked out revision in f.c.
rcsmerge -r2.8 -r2.4 f.c
Note the order of the arguments, and that f.c will be overwritten.
IDENTIFICATION
Author: Walter F. Tichy, Purdue University, West Lafayette, IN, 47907.
Revision Number: 1.2 ; Release Date: 87/02/27 .
Copyright (C) 1982 by Walter F. Tichy.
SEE ALSO ci(1L), co(1L), merge(1L), ident(1L), rcs(1L), rcsdiff(1L), rlog(1L)
Walter F. Tichy, "Design, Implementation, and Evaluation of a Revision Control System," in Proceedings of the 6th International Conference
on Software Engineering, IEEE, Tokyo, Sept. 1982.
BUGS
Rcsmerge does not work on files that contain lines with a single `.'.
Purdue UniversityRCSMERGE(1L)
